diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba0f81277e04cf3f13e0e2588a71567b647d8810..bbb1513baf838b720f1fca311515145b25eac67d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -309,7 +309,7 @@ aws/rke2/cluster down: package: stage: package - image: registry.dso.mil/platform-one/big-bang/bigbang/synker:0.0.2 + image: registry.dso.mil/platform-one/big-bang/bigbang/synker:0.0.3 extends: - .bigbang-dogfood rules: @@ -331,6 +331,9 @@ package: - yq e '.source.images | .[] | ... comments=""' "./synker.yaml" > images.txt # Tar up synker as well? - cp /usr/local/bin/synker synker.yaml /var/lib/registry/ + # Grab the registry image + - crane pull registry:2 registry.tar + - mv registry.tar /var/lib/registry/ - tar -C /var/lib/registry -czvf $IMAGE_PKG . - tar -czvf $IMAGE_PKG /var/lib/registry # Package dependent repos diff --git a/scripts/package/synker.Dockerfile b/scripts/package/synker.Dockerfile index 85b18034feb85a400a942c4b7c0434a4e6eba2c0..68f9d7a4c65f4473da8b2616ddc1fe1333a0d8a3 100644 --- a/scripts/package/synker.Dockerfile +++ b/scripts/package/synker.Dockerfile @@ -28,6 +28,13 @@ RUN curl -sL https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o /tmp/aw /tmp/aws/install && \ rm -rf /tmp/aws* +# Install crane +RUN curl -sL https://github.com/google/go-containerregistry/releases/download/v0.4.1/go-containerregistry_Linux_x86_64.tar.gz -o /tmp/crane.tar.gz && \ + mkdir -p /tmp/crane && \ + tar -zxf /tmp/crane.tar.gz -C /tmp/crane && \ + mv /tmp/crane/crane /usr/local/bin/crane && \ + chmod +x /usr/local/bin/crane && \ + rm -rf /tmp/crane* + RUN yum clean all && \ rm -r /var/cache/dnf - diff --git a/scripts/package/synker.yaml b/scripts/package/synker.yaml index 78badbcacc28a1fc9526974dd81d05a27336c26b..49ea83863da1eab5fc69be290cbfa1c0bff2e2e5 100644 --- a/scripts/package/synker.yaml +++ b/scripts/package/synker.yaml @@ -25,6 +25,9 @@ destination: source: authFile: /root/.docker/config.json images: + # Include registry image + - registry:2 + - registry1.dso.mil/ironbank/twistlock/defender/defender:20.12.531 - registry1.dso.mil/ironbank/anchore/enterprise/enterprise:3.0.1 - registry1.dso.mil/ironbank/anchore/enterpriseui/enterpriseui:3.0.1