diff --git a/.github/workflows/alpine-glibc-image.yaml b/.github/workflows/alpine-glibc.yaml similarity index 100% rename from .github/workflows/alpine-glibc-image.yaml rename to .github/workflows/alpine-glibc.yaml diff --git a/.github/workflows/alpine-image.yaml b/.github/workflows/alpine-with-custom-ca.yaml similarity index 62% rename from .github/workflows/alpine-image.yaml rename to .github/workflows/alpine-with-custom-ca.yaml index 248a828..9b5cb4a 100644 --- a/.github/workflows/alpine-image.yaml +++ b/.github/workflows/alpine-with-custom-ca.yaml @@ -1,10 +1,10 @@ -name: Build & push apline image +name: Build & push apline with custom ca image on: pull_request: push: paths: - - '.github/workflows/alpine-image.yaml' - - 'dockerfiles/alpine-with-ca.Dockerfile' + - 'base/alpine/Dockerfile' + - '.github/workflows/alpine-with-custom-ca.yaml' branches: - main @@ -15,14 +15,14 @@ jobs: steps: - uses: actions/checkout@master - - name: 'Artifact: build && push alpine image' + - name: 'Artifact: build && push alpine with custom ca 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 + build_file: base/alpine/Dockerfile image: k8s/alpine-ca - tag: 3.13 + tag: latest cache: true cache_registry: cache diff --git a/.github/workflows/ci-runner-alpine-image.yaml b/.github/workflows/app-runner-alpine.yaml similarity index 76% rename from .github/workflows/ci-runner-alpine-image.yaml rename to .github/workflows/app-runner-alpine.yaml index 1a141bd..0e9b7c4 100644 --- a/.github/workflows/ci-runner-alpine-image.yaml +++ b/.github/workflows/app-runner-alpine.yaml @@ -1,9 +1,9 @@ -name: Build & push ci runner apline base image +name: Build & push app runner apline base image on: pull_request: push: paths: - - '.github/workflows/ci-runner-alpine-image.yaml' + - '.github/workflows/app-runner-alpine.yaml' - 'ci-runner/alpine/Dockerfile' - 'ci-runner/alpine/Makefile' - 'ci-runner/alpine/ca.crt' @@ -14,11 +14,11 @@ on: jobs: base-image: runs-on: ubuntu-latest - name: build ci runner alpine base image + name: build app runner alpine base image steps: - uses: actions/checkout@master - - name: 'Artifact: build && push alpine image' + - name: 'Artifact: build && push app runner alpine image' uses: aevea/action-kaniko@master with: registry: artifact.onwalk.net diff --git a/.github/workflows/flux-cli-image.yaml b/.github/workflows/flux-cli-image.yaml index bb03328..cb86463 100644 --- a/.github/workflows/flux-cli-image.yaml +++ b/.github/workflows/flux-cli-image.yaml @@ -3,32 +3,14 @@ on: pull_request: push: paths: - - 'dockerfiles/flux-cli.Dockerfile' - - 'dockerfiles/alpine-with-ca.Dockerfile' - - '.github/workflows/alpine-image.yaml' + - 'base/alpine/Dockerfile' + - 'fluxcd/flux-cli.Dockerfile' - '.github/workflows/flux-cli-image.yaml' + - '.github/workflows/alpine-with-custom-ca.yaml' branches: - main jobs: - base-image: - runs-on: ubuntu-latest - name: Build alpine base 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 @@ -42,8 +24,25 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - build_file: dockerfiles/flux-cli.Dockerfile + build_file: fluxcd/flux-cli.Dockerfile image: k8s/fluxcd/flux-cli tag: v0.31.3 cache: true cache_registry: cache + base-image: + runs-on: ubuntu-latest + name: Build alpine base image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine with custom ca image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: base/alpine/Dockerfile + image: k8s/alpine-ca + tag: latest + cache: true + cache_registry: cache diff --git a/.github/workflows/flux-helm-controller-image.yaml b/.github/workflows/flux-helm-controller-image.yaml index 33189ca..a958b7b 100644 --- a/.github/workflows/flux-helm-controller-image.yaml +++ b/.github/workflows/flux-helm-controller-image.yaml @@ -3,31 +3,14 @@ on: pull_request: push: paths: - - '.github/workflows/alpine-image.yaml' - - 'dockerfiles/alpine-with-ca.Dockerfile' - - 'dockerfiles/flux-helm-controller.Dockerfile' + - 'base/alpine/Dockerfile' + - 'fluxcd/flux-helm-controller.Dockerfile' + - '.github/workflows/alpine-with-custom-ca.yaml' - '.github/workflows/flux-helm-controller-image.yaml' branches: - main jobs: - base-image: - runs-on: ubuntu-latest - name: Build alpine base 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 @@ -41,8 +24,25 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - build_file: dockerfiles/flux-helm-controller.Dockerfile + build_file: fluxcd/flux-helm-controller.Dockerfile image: k8s/fluxcd/helm-controller tag: v0.22.1 cache: true cache_registry: cache + base-image: + runs-on: ubuntu-latest + name: Build alpine base image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine with custom ca image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: base/alpine/Dockerfile + image: k8s/alpine-ca + tag: latest + cache: true + cache_registry: cache diff --git a/.github/workflows/flux-image-automation-controller.yaml b/.github/workflows/flux-image-automation-controller.yaml index acca79b..920f126 100644 --- a/.github/workflows/flux-image-automation-controller.yaml +++ b/.github/workflows/flux-image-automation-controller.yaml @@ -3,31 +3,14 @@ on: pull_request: push: paths: - - '.github/workflows/alpine-image.yaml' - - 'dockerfiles/alpine-with-ca.Dockerfile' - - 'dockerfiles/flux-image-automation-controller.Dockerfile' + - 'base/alpine/Dockerfile' + - '.github/workflows/alpine-with-custom-ca.yaml' + - 'fluxcd/flux-image-automation-controller.Dockerfile' - '.github/workflows/flux-image-automation-controller.yaml' branches: - main jobs: - base-image: - runs-on: ubuntu-latest - name: Build alpine base 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 @@ -41,8 +24,25 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - build_file: dockerfiles/flux-image-automation-controller.Dockerfile + build_file: fluxcd/flux-image-automation-controller.Dockerfile image: k8s/fluxcd/image-automation-controller tag: v0.23.4 cache: true cache_registry: cache + base-image: + runs-on: ubuntu-latest + name: Build alpine base image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine with custom ca image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: base/alpine/Dockerfile + image: k8s/alpine-ca + tag: latest + cache: true + cache_registry: cache diff --git a/.github/workflows/flux-image-reflector-controller.yaml b/.github/workflows/flux-image-reflector-controller.yaml index 330a5fb..a5bfc50 100644 --- a/.github/workflows/flux-image-reflector-controller.yaml +++ b/.github/workflows/flux-image-reflector-controller.yaml @@ -3,31 +3,14 @@ on: pull_request: push: paths: - - '.github/workflows/alpine-image.yaml' - - 'dockerfiles/alpine-with-ca.Dockerfile' - - 'dockerfiles/flux-image-reflector-controller.Dockerfile' + - 'base/alpine/Dockerfile' + - '.github/workflows/alpine-with-custom-ca.yaml' + - 'fluxcd/flux-image-reflector-controller.Dockerfile' - '.github/workflows/flux-image-reflector-controller.yaml' branches: - main jobs: - base-image: - runs-on: ubuntu-latest - name: Build alpine base 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 @@ -41,8 +24,25 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - build_file: dockerfiles/flux-image-reflector-controller.Dockerfile + build_file: fluxcd/flux-image-reflector-controller.Dockerfile image: k8s/fluxcd/image-reflector-controller tag: v0.19.2 cache: true cache_registry: cache + base-image: + runs-on: ubuntu-latest + name: Build alpine base image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine with custom ca image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: base/alpine/Dockerfile + image: k8s/alpine-ca + tag: latest + cache: true + cache_registry: cache diff --git a/.github/workflows/flux-kustomize-controller-image.yaml b/.github/workflows/flux-kustomize-controller-image.yaml index ed2b797..5d4186f 100644 --- a/.github/workflows/flux-kustomize-controller-image.yaml +++ b/.github/workflows/flux-kustomize-controller-image.yaml @@ -3,31 +3,14 @@ on: pull_request: push: paths: - - '.github/workflows/alpine-image.yaml' - - 'dockerfiles/alpine-with-ca.Dockerfile' + - 'base/alpine/Dockerfile' + - '.github/workflows/alpine-with-custom-ca.yaml' + - 'fluxcd/flux-kustomize-controller.Dockerfile' - '.github/workflows/flux-kustomize-controller-image.yaml' - - 'dockerfiles/flux-kustomize-controller.Dockerfile' branches: - main jobs: - base-image: - runs-on: ubuntu-latest - name: Build alpine base 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 @@ -41,8 +24,25 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - build_file: dockerfiles/flux-kustomize-controller.Dockerfile + build_file: fluxcd/flux-kustomize-controller.Dockerfile image: k8s/fluxcd/kustomize-controller tag: v0.26.2 cache: true cache_registry: cache + base-image: + runs-on: ubuntu-latest + name: Build alpine base image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine with custom ca image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: base/alpine/Dockerfile + image: k8s/alpine-ca + tag: latest + cache: true + cache_registry: cache diff --git a/.github/workflows/flux-notification-controller-image.yaml b/.github/workflows/flux-notification-controller-image.yaml index e68367f..9255dfe 100644 --- a/.github/workflows/flux-notification-controller-image.yaml +++ b/.github/workflows/flux-notification-controller-image.yaml @@ -3,31 +3,14 @@ on: pull_request: push: paths: - - '.github/workflows/alpine-image.yaml' - - 'dockerfiles/alpine-with-ca.Dockerfile' + - 'base/alpine/Dockerfile' + - '.github/workflows/alpine-with-custom-ca.yaml' - '.github/workflows/flux-notification-controller-image.yaml' - 'dockerfiles/flux-notification-controller.Dockerfile' branches: - main jobs: - base-image: - runs-on: ubuntu-latest - name: Build alpine base 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 @@ -41,8 +24,25 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - build_file: dockerfiles/flux-notification-controller.Dockerfile + build_file: fluxcd/flux-notification-controller.Dockerfile image: k8s/fluxcd/notification-controller tag: v0.24.0 cache: true cache_registry: cache + base-image: + runs-on: ubuntu-latest + name: Build alpine base image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine with custom ca image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: base/alpine/Dockerfile + image: k8s/alpine-ca + tag: latest + cache: true + cache_registry: cache diff --git a/.github/workflows/flux-source-controller-image.yaml b/.github/workflows/flux-source-controller-image.yaml index 06c72fc..a92a641 100644 --- a/.github/workflows/flux-source-controller-image.yaml +++ b/.github/workflows/flux-source-controller-image.yaml @@ -3,31 +3,14 @@ on: pull_request: push: paths: - - '.github/workflows/alpine-image.yaml' - - 'dockerfiles/alpine-with-ca.Dockerfile' + - 'base/alpine/Dockerfile' + - '.github/workflows/alpine-with-custom-ca.yaml' + - 'fluxcd/flux-source-controller.Dockerfile' - '.github/workflows/flux-source-controller-image.yaml' - - 'dockerfiles/flux-source-controller.Dockerfile' branches: - main jobs: - base-image: - runs-on: ubuntu-latest - name: Build alpine base 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 @@ -41,8 +24,25 @@ jobs: registry: artifact.onwalk.net username: admin password: ${{ secrets.HELM_REPO_PASSWORD }} - build_file: dockerfiles/flux-source-controller.Dockerfile + build_file: fluxcd/flux-source-controller.Dockerfile image: k8s/fluxcd/source-controller tag: v0.25.9 cache: true cache_registry: cache + base-image: + runs-on: ubuntu-latest + name: Build alpine base image + steps: + - uses: actions/checkout@master + + - name: 'Artifact: build && push alpine with custom ca image' + uses: aevea/action-kaniko@master + with: + registry: artifact.onwalk.net + username: admin + password: ${{ secrets.HELM_REPO_PASSWORD }} + build_file: base/alpine/Dockerfile + image: k8s/alpine-ca + tag: latest + cache: true + cache_registry: cache diff --git a/.github/workflows/ci-runner-terraform-image.yaml b/.github/workflows/iac-runner-terraform.yaml similarity index 93% rename from .github/workflows/ci-runner-terraform-image.yaml rename to .github/workflows/iac-runner-terraform.yaml index 8f75df4..a7c38fa 100644 --- a/.github/workflows/ci-runner-terraform-image.yaml +++ b/.github/workflows/iac-runner-terraform.yaml @@ -6,7 +6,7 @@ on: - 'ci-runner/terraform/main.tf' - 'ci-runner/terraform/Dockerfile' - 'ci-runner/terraform/.terraformrc' - - '.github/workflows/ci-runner-terraform-image.yaml' + - '.github/workflows/iac-runner-terraform.yaml' branches: - main diff --git a/base/alpine/Dockerfile b/base/alpine/Dockerfile new file mode 100644 index 0000000..272ab1f --- /dev/null +++ b/base/alpine/Dockerfile @@ -0,0 +1,7 @@ +FROM alpine:latest +MAINTAINER shenlan xz@onwalk.net + +ADD ca.crt /usr/share/ca-certificates/mozilla/Lets_Encrypt_ca.crt +RUN apk add --no-cache ca-certificates && echo "mozilla/Lets_Encrypt_ca.crt" >> /etc/ca-certificates.conf && update-ca-certificates + +ENTRYPOINT [ "/bin/sh" ] diff --git a/base/alpine/ca.crt b/base/alpine/ca.crt new file mode 100644 index 0000000..f6a9302 --- /dev/null +++ b/base/alpine/ca.crt @@ -0,0 +1,71 @@ +-----BEGIN CERTIFICATE----- +MIIG1TCCBL2gAwIBAgIQbFWr29AHksedBwzYEZ7WvzANBgkqhkiG9w0BAQwFADCB +iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl +cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV +BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMjAw +MTMwMDAwMDAwWhcNMzAwMTI5MjM1OTU5WjBLMQswCQYDVQQGEwJBVDEQMA4GA1UE +ChMHWmVyb1NTTDEqMCgGA1UEAxMhWmVyb1NTTCBSU0EgRG9tYWluIFNlY3VyZSBT +aXRlIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAhmlzfqO1Mdgj +4W3dpBPTVBX1AuvcAyG1fl0dUnw/MeueCWzRWTheZ35LVo91kLI3DDVaZKW+TBAs +JBjEbYmMwcWSTWYCg5334SF0+ctDAsFxsX+rTDh9kSrG/4mp6OShubLaEIUJiZo4 +t873TuSd0Wj5DWt3DtpAG8T35l/v+xrN8ub8PSSoX5Vkgw+jWf4KQtNvUFLDq8mF +WhUnPL6jHAADXpvs4lTNYwOtx9yQtbpxwSt7QJY1+ICrmRJB6BuKRt/jfDJF9Jsc +RQVlHIxQdKAJl7oaVnXgDkqtk2qddd3kCDXd74gv813G91z7CjsGyJ93oJIlNS3U +gFbD6V54JMgZ3rSmotYbz98oZxX7MKbtCm1aJ/q+hTv2YK1yMxrnfcieKmOYBbFD +hnW5O6RMA703dBK92j6XRN2EttLkQuujZgy+jXRKtaWMIlkNkWJmOiHmErQngHvt +iNkIcjJumq1ddFX4iaTI40a6zgvIBtxFeDs2RfcaH73er7ctNUUqgQT5rFgJhMmF +x76rQgB5OZUkodb5k2ex7P+Gu4J86bS15094UuYcV09hVeknmTh5Ex9CBKipLS2W +2wKBakf+aVYnNCU6S0nASqt2xrZpGC1v7v6DhuepyyJtn3qSV2PoBiU5Sql+aARp +wUibQMGm44gjyNDqDlVp+ShLQlUH9x8CAwEAAaOCAXUwggFxMB8GA1UdIwQYMBaA +FFN5v1qqK0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBTI2XhootkZaNU9ct5fCj7c +tYaGpjAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUE +FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC +TjAIBgZngQwBAgEwUAYDVR0fBEkwRzBFoEOgQYY/aHR0cDovL2NybC51c2VydHJ1 +c3QuY29tL1VTRVJUcnVzdFJTQUNlcnRpZmljYXRpb25BdXRob3JpdHkuY3JsMHYG +CCsGAQUFBwEBBGowaDA/BggrBgEFBQcwAoYzaHR0cDovL2NydC51c2VydHJ1c3Qu +Y29tL1VTRVJUcnVzdFJTQUFkZFRydXN0Q0EuY3J0MCUGCCsGAQUFBzABhhlodHRw +Oi8vb2NzcC51c2VydHJ1c3QuY29tMA0GCSqGSIb3DQEBDAUAA4ICAQAVDwoIzQDV +ercT0eYqZjBNJ8VNWwVFlQOtZERqn5iWnEVaLZZdzxlbvz2Fx0ExUNuUEgYkIVM4 +YocKkCQ7hO5noicoq/DrEYH5IuNcuW1I8JJZ9DLuB1fYvIHlZ2JG46iNbVKA3ygA +Ez86RvDQlt2C494qqPVItRjrz9YlJEGT0DrttyApq0YLFDzf+Z1pkMhh7c+7fXeJ +qmIhfJpduKc8HEQkYQQShen426S3H0JrIAbKcBCiyYFuOhfyvuwVCFDfFvrjADjd +4jX1uQXd161IyFRbm89s2Oj5oU1wDYz5sx+hoCuh6lSs+/uPuWomIq3y1GDFNafW ++LsHBU16lQo5Q2yh25laQsKRgyPmMpHJ98edm6y2sHUabASmRHxvGiuwwE25aDU0 +2SAeepyImJ2CzB80YG7WxlynHqNhpE7xfC7PzQlLgmfEHdU+tHFeQazRQnrFkW2W +kqRGIq7cKRnyypvjPMkjeiV9lRdAM9fSJvsB3svUuu1coIG1xxI1yegoGM4r5QP4 +RGIVvYaiI76C0djoSbQ/dkIUUXQuB8AL5jyH34g3BZaaXyvpmnV4ilppMXVAnAYG +ON51WhJ6W0xNdNJwzYASZYH+tmCWI+N60Gv2NNMGHwMZ7e9bXgzUCZH5FaBFDGR5 +S9VWqHB73Q+OyIVvIbKYcSc2w/aSuFKGSA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFgTCCBGmgAwIBAgIQOXJEOvkit1HX02wQ3TE1lTANBgkqhkiG9w0BAQwFADB7 +MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD +VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE +AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4 +MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5 +MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO +ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sI +s9CsVw127c0n00ytUINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnG +vDoZtF+mvX2do2NCtnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQ +Ijy8/hPwhxR79uQfjtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfb +IWax1Jt4A8BQOujM8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0 +tyA9yn8iNK5+O2hmAUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97E +xwzf4TKuzJM7UXiVZ4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNV +icQNwZNUMBkTrNN9N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5 +D9kCnusSTJV882sFqV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJ +WBp/kjbmUZIO8yZ9HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ +5lhCLkMaTLTwJUdZ+gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzG +KAgEJTm4Diup8kyXHAc/DVL17e8vgg8CAwEAAaOB8jCB7zAfBgNVHSMEGDAWgBSg +EQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rID +ZsswDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAG +BgRVHSAAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t +L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr +BgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUA +A4IBAQAYh1HcdCE9nIrgJ7cz0C7M7PDmy14R3iJvm3WOnnL+5Nb+qh+cli3vA0p+ +rvSNb3I8QzvAP+u431yqqcau8vzY7qN7Q/aGNnwU4M309z/+3ri0ivCRlv79Q2R+ +/czSAaF9ffgZGclCKxO/WIu6pKJmBHaIkU4MiRTOok3JMrO66BQavHHxW/BBC5gA +CiIDEOUMsfnNkjcZ7Tvx5Dq2+UUTJnWvu6rvP3t3O9LEApE9GQDTF1w52z97GA1F +zZOFli9d31kWTz9RvdVFGD/tSo7oBmF0Ixa1DVBzJ0RHfxBdiSprhTEUxOipakyA +vGp4z7h/jnZymQyd/teRCBaho1+V +-----END CERTIFICATE----- diff --git a/dockerfiles/alpine-with-ca.Dockerfile b/dockerfiles/alpine-with-ca.Dockerfile deleted file mode 100644 index bd2fb58..0000000 --- a/dockerfiles/alpine-with-ca.Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM ghcr.io/jitesoft/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/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" ] diff --git a/dockerfiles/flux-cli.Dockerfile b/fluxcd/flux-cli.Dockerfile similarity index 100% rename from dockerfiles/flux-cli.Dockerfile rename to fluxcd/flux-cli.Dockerfile diff --git a/dockerfiles/flux-helm-controller.Dockerfile b/fluxcd/flux-helm-controller.Dockerfile similarity index 100% rename from dockerfiles/flux-helm-controller.Dockerfile rename to fluxcd/flux-helm-controller.Dockerfile diff --git a/dockerfiles/flux-helm-flux-image-automation-controller.Dockerfile b/fluxcd/flux-helm-flux-image-automation-controller.Dockerfile similarity index 100% rename from dockerfiles/flux-helm-flux-image-automation-controller.Dockerfile rename to fluxcd/flux-helm-flux-image-automation-controller.Dockerfile diff --git a/dockerfiles/flux-image-automation-controller.Dockerfile b/fluxcd/flux-image-automation-controller.Dockerfile similarity index 100% rename from dockerfiles/flux-image-automation-controller.Dockerfile rename to fluxcd/flux-image-automation-controller.Dockerfile diff --git a/dockerfiles/flux-image-reflector-controller.Dockerfile b/fluxcd/flux-image-reflector-controller.Dockerfile similarity index 100% rename from dockerfiles/flux-image-reflector-controller.Dockerfile rename to fluxcd/flux-image-reflector-controller.Dockerfile diff --git a/dockerfiles/flux-kustomize-controller.Dockerfile b/fluxcd/flux-kustomize-controller.Dockerfile similarity index 100% rename from dockerfiles/flux-kustomize-controller.Dockerfile rename to fluxcd/flux-kustomize-controller.Dockerfile diff --git a/dockerfiles/flux-notification-controller.Dockerfile b/fluxcd/flux-notification-controller.Dockerfile similarity index 100% rename from dockerfiles/flux-notification-controller.Dockerfile rename to fluxcd/flux-notification-controller.Dockerfile diff --git a/dockerfiles/flux-source-controller.Dockerfile b/fluxcd/flux-source-controller.Dockerfile similarity index 100% rename from dockerfiles/flux-source-controller.Dockerfile rename to fluxcd/flux-source-controller.Dockerfile