Skip to content

Commit

Permalink
remove debug lines
Browse files Browse the repository at this point in the history
  • Loading branch information
nianyush committed Oct 17, 2023
1 parent c9e9d6c commit 7b44e45
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ ARG HTTPS_PROXY
ARG NO_PROXY

COPY sc.crt /tmp/sc.crt
RUN echo $OS_DISTRIBUTION
RUN echo $PROXY_CERT_PATH
RUN if [ "${OS_DISTRIBUTION}" = "ubuntu" ] && [ "${PROXY_CERT_PATH}" != "" ]; then \
cp /tmp/sc.crt /etc/ssl/certs && \
update-ca-certificates; \
Expand All @@ -18,8 +16,6 @@ RUN if [ "${OS_DISTRIBUTION}" = "opensuse-leap" ] && [ "${PROXY_CERT_PATH}" != "
cp /tmp/sc.crt /usr/share/pki/trust/anchors && \
update-ca-certificates; \
fi
RUN cat /tmp/sc.crt
RUN cat /usr/share/pki/trust/anchors/sc.crt

###########################Add any other image customizations here #######################

Expand Down
5 changes: 4 additions & 1 deletion earthly.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/bin/bash
# Uncomment the line below to enable debug mode
# set -x

function build_with_proxy() {
export HTTP_PROXY=$HTTP_PROXY
export HTTPS_PROXY=$HTTPS_PROXY
Expand All @@ -13,7 +16,7 @@ function build_with_proxy() {
docker exec -it earthly-buildkitd update-ca-certificates

# Run Earthly in Docker to create artifacts Variables are passed from the .arg file
docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm --env EARTHLY_BUILD_ARGS -t -e GLOBAL_CONFIG="$global_config" -e EARTHLY_BUILDKIT_HOST=tcp://0.0.0.0:8372 -e BUILDKIT_TLS_ENABLED=false -v "$(pwd)":/workspace -v "$PROXY_CERT_PATH:/workspace/sc.crt:ro" gcr.io/spectro-images-public/earthly/earthly:$EARTHLY_VERSION --allow-privileged --verbose "$@"
docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock --rm --env EARTHLY_BUILD_ARGS -t -e GLOBAL_CONFIG="$global_config" -e EARTHLY_BUILDKIT_HOST=tcp://0.0.0.0:8372 -e BUILDKIT_TLS_ENABLED=false -v "$(pwd)":/workspace -v "$PROXY_CERT_PATH:/workspace/sc.crt:ro" gcr.io/spectro-images-public/earthly/earthly:$EARTHLY_VERSION --allow-privileged "$@"
}

function build_without_proxy() {
Expand Down

0 comments on commit 7b44e45

Please sign in to comment.