Skip to content

Update bitnami shell image from the archived one to active one #788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed
72 changes: 35 additions & 37 deletions .github/workflows/offline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ jobs:
with:
name: wire-server
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"

- name: Install nix environment
run: nix-env -f default.nix -iA env

- name: Get upload name
id: upload_name
run: |
Expand All @@ -38,47 +36,47 @@ jobs:
echo ::set-output name=UPLOAD_NAME::$GITHUB_SHA
# echo ::set-output name=UPLOAD_NAME::${SOURCE_TAG:-$GITHUB_SHA}

# demo profile build
- name: Process the demo profile build
run: ./offline/demo-build/build.sh
env:
GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}'
DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}'
# # demo profile build
# - name: Process the demo profile build
# run: ./offline/demo-build/build.sh
# env:
# GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}'
# DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}'

- name: Copy demo build assets tarball to S3 and clean up
run: |
# Upload tarball for each profile by specifying their OUTPUT_TAR path
aws s3 cp offline/demo-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-demo-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz
echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-demo-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz"
# remove the assets from the build to optimize the space on the server
rm -rf offline/demo-build/output/*
env:
AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
AWS_REGION: "eu-west-1"
# - name: Copy demo build assets tarball to S3 and clean up
# run: |
# # Upload tarball for each profile by specifying their OUTPUT_TAR path
# aws s3 cp offline/demo-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-demo-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz
# echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-demo-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz"
# # remove the assets from the build to optimize the space on the server
# rm -rf offline/demo-build/output/*
# env:
# AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
# AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
# AWS_REGION: "eu-west-1"

# min profile build
- name: Process the min profile build
run: ./offline/min-build/build.sh
env:
GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}'
DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}'
# # min profile build
# - name: Process the min profile build
# run: ./offline/min-build/build.sh
# env:
# GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}'
# DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}'

- name: Copy min build assets tarball to S3
run: |
# Upload tarball for each profile by specifying their OUTPUT_TAR path
aws s3 cp offline/min-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz
echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz"
# remove the archives from the build to optimize the space on the server
rm -rf offline/min-build/output/*
env:
AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
AWS_REGION: "eu-west-1"
# - name: Copy min build assets tarball to S3
# run: |
# # Upload tarball for each profile by specifying their OUTPUT_TAR path
# aws s3 cp offline/min-build/output/assets.tgz s3://public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz
# echo "Uploaded to: https://s3-$AWS_REGION.amazonaws.com/public.wire.com/artifacts/wire-server-deploy-static-min-${{ steps.upload_name.outputs.UPLOAD_NAME }}.tgz"
# # remove the archives from the build to optimize the space on the server
# rm -rf offline/min-build/output/*
# env:
# AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
# AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
# AWS_REGION: "eu-west-1"

# deafult profile build
- name: Process the default profile build
run: ./offline/default-build/build.sh
run: ./offline/default-build/build.sh --verbose
env:
GPG_PRIVATE_KEY: '${{ secrets.GPG_PRIVATE_KEY }}'
DOCKER_LOGIN: '${{ secrets.DOCKER_LOGIN }}'
Expand Down
2 changes: 1 addition & 1 deletion offline/default-build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ cp -r "${ROOT_DIR}"/values "${OUTPUT_DIR}"/
"${TASKS_DIR}"/build_linux_pkgs.sh "${OUTPUT_DIR}" "${ROOT_DIR}"

# Creating system containers tarball
"${TASKS_DIR}"/proc_system_containers.sh "${OUTPUT_DIR}"
bash -x "${TASKS_DIR}"/proc_system_containers.sh "${OUTPUT_DIR}"

# Processing wire binaries
"${TASKS_DIR}"/proc_wire_binaries.sh "${OUTPUT_DIR}" "${ROOT_DIR}"
Expand Down
2 changes: 0 additions & 2 deletions offline/tasks/proc_system_containers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ docker.io/library/nginx:1.25.4-alpine
bats/bats:1.11.1
cr.step.sm/smallstep/step-ca:0.25.3-rc7
registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20231011-8b53cabe0
docker.io/bitnami/bitnami-shell:11-debian-11-r38
docker.io/bitnami/postgresql:14.5.0-debian-11-r24
EOF
}

Expand Down
4 changes: 2 additions & 2 deletions offline/tasks/process_charts.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -euo pipefail
set -xeuo pipefail

OUTPUT_DIR=""
# Default exclude list
Expand Down Expand Up @@ -50,4 +50,4 @@ sed -i '/-integration/d' "${HELM_IMAGE_TREE_FILE}"
grep -vE "$EXCLUDE_PATTERN" "${OUTPUT_DIR}"/images | create-container-dump "${OUTPUT_DIR}"/containers-helm

tar cf "${OUTPUT_DIR}"/containers-helm.tar -C "${OUTPUT_DIR}" containers-helm
mv "${OUTPUT_DIR}/containers-helm/images.json" "${OUTPUT_DIR}"/versions/containers_helm_images.json
mv "${OUTPUT_DIR}/containers-helm/images.json" "${OUTPUT_DIR}"/versions/containers_helm_images.json
Loading