diff --git a/.github/workflows/alpine-image.yaml b/.github/workflows/alpine-image.yaml index bd98878..6297f6f 100644 --- a/.github/workflows/alpine-image.yaml +++ b/.github/workflows/alpine-image.yaml @@ -9,7 +9,7 @@ on: - main jobs: - docker: + base-image: runs-on: ubuntu-latest name: Build docker image steps: diff --git a/.github/workflows/flux-cli-image.yaml b/.github/workflows/flux-cli-image.yaml index 56df6d3..8829570 100644 --- a/.github/workflows/flux-cli-image.yaml +++ b/.github/workflows/flux-cli-image.yaml @@ -9,12 +9,31 @@ on: - main jobs: - docker: + base-image: runs-on: ubuntu-latest name: Build docker image steps: - uses: actions/checkout@master + - name: 'Artifact: build && push alpine image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: ./dockerfiles/alpine-with-ca.Dockerfile + image: k8s/alpine-ca + tag: 3.13 + cache: true + cache_registry: cache + + docker: + name: Build docker image + runs-on: ubuntu-latest + needs: base-image + steps: + - uses: actions/checkout@master + - name: 'Artifact: build && push fluxcd/flux-cli image' uses: aevea/action-kaniko@master with: diff --git a/.github/workflows/flux-helm-controller-image.yaml b/.github/workflows/flux-helm-controller-image.yaml index 10c226e..a7d75a5 100644 --- a/.github/workflows/flux-helm-controller-image.yaml +++ b/.github/workflows/flux-helm-controller-image.yaml @@ -9,8 +9,26 @@ on: - main jobs: + base-image: + runs-on: ubuntu-latest + name: Build docker image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: ./dockerfiles/alpine-with-ca.Dockerfile + image: k8s/alpine-ca + tag: 3.13 + cache: true + cache_registry: cache docker: runs-on: ubuntu-latest + needs: base-image name: Build docker image steps: - uses: actions/checkout@master diff --git a/.github/workflows/flux-image-automation-controller.yaml b/.github/workflows/flux-image-automation-controller.yaml index 115830e..02a4201 100644 --- a/.github/workflows/flux-image-automation-controller.yaml +++ b/.github/workflows/flux-image-automation-controller.yaml @@ -9,7 +9,25 @@ on: - main jobs: + base-image: + runs-on: ubuntu-latest + name: Build docker image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: ./dockerfiles/alpine-with-ca.Dockerfile + image: k8s/alpine-ca + tag: 3.13 + cache: true + cache_registry: cache docker: + needs: base-image runs-on: ubuntu-latest name: Build docker image steps: diff --git a/.github/workflows/flux-image-reflector-controller.yaml b/.github/workflows/flux-image-reflector-controller.yaml index 087f08f..2ecca76 100644 --- a/.github/workflows/flux-image-reflector-controller.yaml +++ b/.github/workflows/flux-image-reflector-controller.yaml @@ -9,7 +9,25 @@ on: - main jobs: + base-image: + runs-on: ubuntu-latest + name: Build docker image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: ./dockerfiles/alpine-with-ca.Dockerfile + image: k8s/alpine-ca + tag: 3.13 + cache: true + cache_registry: cache docker: + needs: base-image runs-on: ubuntu-latest name: Build docker image steps: diff --git a/.github/workflows/flux-kustomize-controller-image.yaml b/.github/workflows/flux-kustomize-controller-image.yaml index be764f9..457733e 100644 --- a/.github/workflows/flux-kustomize-controller-image.yaml +++ b/.github/workflows/flux-kustomize-controller-image.yaml @@ -9,7 +9,25 @@ on: - main jobs: + base-image: + runs-on: ubuntu-latest + name: Build docker image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: ./dockerfiles/alpine-with-ca.Dockerfile + image: k8s/alpine-ca + tag: 3.13 + cache: true + cache_registry: cache docker: + needs: base-image runs-on: ubuntu-latest name: Build docker image steps: diff --git a/.github/workflows/flux-notification-controller-image.yaml b/.github/workflows/flux-notification-controller-image.yaml index 331dbf8..d547190 100644 --- a/.github/workflows/flux-notification-controller-image.yaml +++ b/.github/workflows/flux-notification-controller-image.yaml @@ -9,7 +9,25 @@ on: - main jobs: + base-image: + runs-on: ubuntu-latest + name: Build docker image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: ./dockerfiles/alpine-with-ca.Dockerfile + image: k8s/alpine-ca + tag: 3.13 + cache: true + cache_registry: cache docker: + needs: base-image runs-on: ubuntu-latest name: Build docker image steps: diff --git a/.github/workflows/flux-source-controller-image.yaml b/.github/workflows/flux-source-controller-image.yaml index d3508f4..1639f65 100644 --- a/.github/workflows/flux-source-controller-image.yaml +++ b/.github/workflows/flux-source-controller-image.yaml @@ -9,7 +9,25 @@ on: - main jobs: + base-image: + runs-on: ubuntu-latest + name: Build docker image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: ./dockerfiles/alpine-with-ca.Dockerfile + image: k8s/alpine-ca + tag: 3.13 + cache: true + cache_registry: cache docker: + needs: base-image runs-on: ubuntu-latest name: Build docker image steps: diff --git a/dockerfiles/alpine-with-ca.Dockerfile b/dockerfiles/alpine-with-ca.Dockerfile index 684521c..4ab5ec5 100644 --- a/dockerfiles/alpine-with-ca.Dockerfile +++ b/dockerfiles/alpine-with-ca.Dockerfile @@ -1,4 +1,5 @@ FROM alpine:3.13 RUN apk add --no-cache curl ca-certificates -RUN cd /usr/share/ca-certificates/ && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201.cer -o RocheRootCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA1.cer -o RocheEnterpriseCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA2.cer -o RocheEnterpriseCA2.cer && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201%20-%20G2.crt -o RocheRootCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20Enterprise%20CA%201%20-%20G2.crt -o RocheEnterpriseCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Root%20CA.crt -o RocheG3RootCA.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%201.crt -o RocheG3IssuingCA1.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%202.crt -o RocheG3IssuingCA2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%203.crt -o RocheG3IssuingCA3.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%204.crt -o RocheG3IssuingCA4.crt && update-ca-certificates +#RUN cd /usr/share/ca-certificates/ && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201.cer -o RocheRootCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA1.cer -o RocheEnterpriseCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA2.cer -o RocheEnterpriseCA2.cer && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201%20-%20G2.crt -o RocheRootCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20Enterprise%20CA%201%20-%20G2.crt -o RocheEnterpriseCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Root%20CA.crt -o RocheG3RootCA.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%201.crt -o RocheG3IssuingCA1.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%202.crt -o RocheG3IssuingCA2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%203.crt -o RocheG3IssuingCA3.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%204.crt -o RocheG3IssuingCA4.crt && update-ca-certificates +RUN cd /usr/local/share/ca-certificates/ && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201.cer -o RocheRootCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA1.cer -o RocheEnterpriseCA1.cer && curl http://certinfo.roche.com/rootcerts/RocheEnterpriseCA2.cer -o RocheEnterpriseCA2.cer && curl http://certinfo.roche.com/rootcerts/Roche%20Root%20CA%201%20-%20G2.crt -o RocheRootCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20Enterprise%20CA%201%20-%20G2.crt -o RocheEnterpriseCA1-G2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Root%20CA.crt -o RocheG3RootCA.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%201.crt -o RocheG3IssuingCA1.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%202.crt -o RocheG3IssuingCA2.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%203.crt -o RocheG3IssuingCA3.crt && curl http://certinfo.roche.com/rootcerts/Roche%20G3%20Issuing%20CA%204.crt -o RocheG3IssuingCA4.crt && update-ca-certificates ENTRYPOINT [ "/bin/sh" ]