Skip to content

Commit

Permalink
remove env var from image, to allow other to use easily (#1207)
Browse files Browse the repository at this point in the history
* remove env var from image, to allow other to use easily

* add env var in ci
  • Loading branch information
pepoviola authored Aug 1, 2023
1 parent a07b605 commit a69a89f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
--test="0013-db-snapshot.zndsl"
2 changes: 0 additions & 2 deletions scripts/ci/docker/zombienet_builder.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci/docker/zombienet_injected.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit a69a89f

Please sign in to comment.