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

chore: allow docker-host to be configurable #331

Merged
merged 1 commit into from
Jul 9, 2024
Merged

chore: allow docker-host to be configurable #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ COPY legacy/scripts /kubectl-build-deploy/scripts
COPY legacy/helmcharts /kubectl-build-deploy/helmcharts

ENV DBAAS_OPERATOR_HTTP=dbaas.lagoon.svc:5000
ENV DOCKER_HOST=docker-host.lagoon.svc

RUN architecture=$(case $(uname -m) in x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "amd64" ;; esac) \
&& curl -sSL https://github.com/uselagoon/lagoon-linter/releases/download/v0.8.0/lagoon-linter_0.8.0_linux_${architecture}.tar.gz \
Expand Down
61 changes: 0 additions & 61 deletions legacy/Dockerfile.kubectl
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions legacy/Dockerfile.kubectl-build-deploy-dind
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions legacy/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ set -e
# try connect to docker-host 10 times before giving up
DOCKER_HOST_COUNTER=1
DOCKER_HOST_TIMEOUT=10
until docker -H docker-host.lagoon.svc info &> /dev/null
until docker -H ${DOCKER_HOST} info &> /dev/null
do
if [ $DOCKER_HOST_COUNTER -lt $DOCKER_HOST_TIMEOUT ]; then
let DOCKER_HOST_COUNTER=DOCKER_HOST_COUNTER+1
echo "docker-host.lagoon.svc not available yet, waiting for 5 secs"
echo "${DOCKER_HOST} not available yet, waiting for 5 secs"
sleep 5
else
echo "could not connect to docker-host.lagoon.svc"
echo "could not connect to ${DOCKER_HOST}"
exit 1
fi
done
export DOCKER_HOST=docker-host.lagoon.svc


mkdir -p ~/.ssh

Expand Down
Loading