Skip to content
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.

Sign up for GitHub

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

Jump to bottom

remove env var from image, to allow other to use easily #1207

Merged
merged 2 commits into from
Aug 1, 2023
Merged

remove env var from image, to allow other to use easily #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a405fb1
remove env var from image, to allow other to use easily
pepoviola Jul 29, 2023
331cfab
add env var in ci
pepoviola Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading