From 2bac841b42c9730ffbdbd2e054fd556e5dc78f67 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:12:11 -0800 Subject: [PATCH 1/4] see what happens --- .github/workflows/docker-build-context/Dockerfile | 4 ++++ .../docker-build-context/entrypoint-finalize-setup.sh | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 .github/workflows/docker-build-context/entrypoint-finalize-setup.sh diff --git a/.github/workflows/docker-build-context/Dockerfile b/.github/workflows/docker-build-context/Dockerfile index f40106410..3d1bda0ba 100644 --- a/.github/workflows/docker-build-context/Dockerfile +++ b/.github/workflows/docker-build-context/Dockerfile @@ -110,3 +110,7 @@ EXPOSE $TLS_PORT # Cleanup RUN rm $CLUSTER_NAME_FILE_NAME + +# Run our own set up steps after server finishes starting up +COPY entrypoint-finalize-setup.sh / +ENTRYPOINT /entrypoint-finalize-setup.sh diff --git a/.github/workflows/docker-build-context/entrypoint-finalize-setup.sh b/.github/workflows/docker-build-context/entrypoint-finalize-setup.sh new file mode 100644 index 000000000..d6a50d43c --- /dev/null +++ b/.github/workflows/docker-build-context/entrypoint-finalize-setup.sh @@ -0,0 +1,6 @@ +/entrypoint.sh + +SUPERUSER_NAME_AND_PASSWORD=superuser +ASADM_AUTH_FLAGS="--user=$SUPERUSER_NAME_AND_PASSWORD --password=$SUPERUSER_NAME_AND_PASSWORD" +asadm $ASADM_AUTH_FLAGS --enable --execute "manage revive ns test" +asadm $ASADM_AUTH_FLAGS --enable --execute "manage recluster" From b2917a8610e62462038a99e06bf3019e2163f644 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:38:02 -0800 Subject: [PATCH 2/4] Add x permission to run entrypoint --- .../workflows/docker-build-context/entrypoint-finalize-setup.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/workflows/docker-build-context/entrypoint-finalize-setup.sh diff --git a/.github/workflows/docker-build-context/entrypoint-finalize-setup.sh b/.github/workflows/docker-build-context/entrypoint-finalize-setup.sh old mode 100644 new mode 100755 From 7b35c7ebf6d12d78f68bc5eb2b3cee972f6017a0 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Wed, 4 Dec 2024 08:35:57 -0800 Subject: [PATCH 3/4] run with the same command as original docker image --- .github/workflows/docker-build-context/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-context/Dockerfile b/.github/workflows/docker-build-context/Dockerfile index 3d1bda0ba..ad527efef 100644 --- a/.github/workflows/docker-build-context/Dockerfile +++ b/.github/workflows/docker-build-context/Dockerfile @@ -113,4 +113,4 @@ RUN rm $CLUSTER_NAME_FILE_NAME # Run our own set up steps after server finishes starting up COPY entrypoint-finalize-setup.sh / -ENTRYPOINT /entrypoint-finalize-setup.sh +ENTRYPOINT ["/usr/bin/as-tini-static", "-r", "SIGUSR1", "-t", "SIGTERM", "--", "/entrypoint-finalize-setup.sh"] From 903a1ec1ba05ae3ee05498354ae50bc4196449d2 Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Wed, 4 Dec 2024 08:39:41 -0800 Subject: [PATCH 4/4] fix warning --- .github/workflows/manylinux2014-openssl.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manylinux2014-openssl.Dockerfile b/.github/workflows/manylinux2014-openssl.Dockerfile index a807685ff..00db671fd 100644 --- a/.github/workflows/manylinux2014-openssl.Dockerfile +++ b/.github/workflows/manylinux2014-openssl.Dockerfile @@ -5,6 +5,7 @@ LABEL com.aerospike.clients.openssl-version=$OPENSSL_VERSION RUN yum install -y perl-core wget +WORKDIR / ARG OPENSSL_TAR_NAME=openssl-$OPENSSL_VERSION RUN wget https://www.openssl.org/source/$OPENSSL_TAR_NAME.tar.gz RUN tar xzvf $OPENSSL_TAR_NAME.tar.gz