diff --git a/.github/workflows/flux-image-automation-controller.yaml b/.github/workflows/flux-image-automation-controller.yaml index 089a329..0c2fea2 100644 --- a/.github/workflows/flux-image-automation-controller.yaml +++ b/.github/workflows/flux-image-automation-controller.yaml @@ -21,7 +21,7 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - path: ./image-automation-controller/ + build_file: dockerfiles/flux-image-automation-controller.Dockerfile image: k8s/fluxcd/image-automation-controller tag: v0.24.0 cache: true diff --git a/Readme.md b/Readme.md old mode 100755 new mode 100644 diff --git a/dockerfiles/flux-image-automation-controller.Dockerfile b/dockerfiles/flux-image-automation-controller.Dockerfile index ebdc3b5..68f1dd3 100755 --- a/dockerfiles/flux-image-automation-controller.Dockerfile +++ b/dockerfiles/flux-image-automation-controller.Dockerfile @@ -1,7 +1,9 @@ -FROM ghcr.io/fluxcd/image-automation-controller:v0.24.0 +FROM ghcr.io/fluxcd/image-automation-controller:v0.24.0 as build -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 +FROM artifact.onwalk.net/alpine-ca:3.13 + +# Copy over binary from build +COPY --from=build /image-automation-controller /usr/local/bin/ USER 65534:65534 ENTRYPOINT [ "image-automation-controller" ] diff --git a/image-automation-controller b/image-automation-controller deleted file mode 160000 index ca012e2..0000000 --- a/image-automation-controller +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca012e2b71c6613ed0fee519926f6817173e398b