From a69a89ff50fe5776eeb30b6af9d14ab0b11dd5e1 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Tue, 1 Aug 2023 11:46:31 -0300 Subject: [PATCH] remove env var from image, to allow other to use easily (#1207) * remove env var from image, to allow other to use easily * add env var in ci --- .gitlab-ci.yml | 3 ++- scripts/ci/docker/zombienet_builder.Dockerfile | 2 -- scripts/ci/docker/zombienet_injected.Dockerfile | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e83a42f0..c2aee82cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ variables: IMAGE_NAME: $DOCKERHUB_REPO/zombienet BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29" BUILDAH_COMMAND: "buildah --storage-driver overlay2" + RUN_IN_CONTAINER: "1" .kubernetes-env: &kubernetes-env image: $CI_IMAGE @@ -279,4 +280,4 @@ db-snapshot: script: - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}" - --test="0013-db-snapshot.zndsl" \ No newline at end of file + --test="0013-db-snapshot.zndsl" diff --git a/scripts/ci/docker/zombienet_builder.Dockerfile b/scripts/ci/docker/zombienet_builder.Dockerfile index d103ef58d..200a7d0df 100644 --- a/scripts/ci/docker/zombienet_builder.Dockerfile +++ b/scripts/ci/docker/zombienet_builder.Dockerfile @@ -72,8 +72,6 @@ RUN mkdir -p /etc/zombie-net RUN chown -R nonroot. /etc/zombie-net # Use the non-root user to run our application -# Tell run test script that it runs in container -ENV RUN_IN_CONTAINER 1 USER nonroot # Tini allows us to avoid several Docker edge cases, see https://github.com/krallin/tini. ENTRYPOINT ["tini", "--", "bash"] diff --git a/scripts/ci/docker/zombienet_injected.Dockerfile b/scripts/ci/docker/zombienet_injected.Dockerfile index 64b700690..a0ab21b52 100644 --- a/scripts/ci/docker/zombienet_injected.Dockerfile +++ b/scripts/ci/docker/zombienet_injected.Dockerfile @@ -57,8 +57,6 @@ RUN mkdir -p /etc/zombie-net RUN chown -R nonroot. /etc/zombie-net # Use the non-root user to run our application -# Tell run test script that it runs in container -ENV RUN_IN_CONTAINER 1 USER nonroot # Tini allows us to avoid several Docker edge cases, see https://github.com/krallin/tini. ENTRYPOINT ["tini", "--", "bash"]