luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docker/build.sh: More fixes

Browse source
This commit is contained in:
Anmol Sethi 2023-02-09 19:50:18 -08:00
parent 614691a06a
commit 5ee68852c5
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ci/release/aws/ensure.sh
View file

@ -331,6 +331,13 @@ sudo -E apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-
sudo groupadd docker || true
sudo usermod -aG docker \$USER
printf %s '$CI_DOCKER_TOKEN' | docker login -u terrastruct --password-stdin
# For building images cross platform.
sudo -E apt-get install -y qemu qemu-user-static
if docker buildx ls | grep -q 'default \*'; then
docker buildx create --use
fi
mkdir -p \$HOME/.local/bin
mkdir -p \$HOME/.local/share/man
EOF
@ -387,7 +394,7 @@ init_remote_env() {
sh_c ssh "$REMOTE_HOST" "sudo systemctl restart sshd"
# ubuntu has $PATH hard coded in /etc/environment for some reason. It takes precedence
# over ~/.ssh/environment.
sh_c ssh "$REMOTE_HOST" "sudo rm /etc/environment"
sh_c ssh "$REMOTE_HOST" "sudo rm -f /etc/environment"
fi
}

3
ci/release/build.sh
View file

@ -265,6 +265,9 @@ build_docker() {
sh_c lockfile_ssh "$CI_D2_LINUX_AMD64" .d2-build-lock
sh_c gitsync "$CI_D2_LINUX_AMD64" src/d2
sh_c rsync --archive --human-readable \
"$BUILD_DIR/d2-$VERSION"-linux-*.tar.gz \
"$CI_D2_LINUX_AMD64:src/d2/$BUILD_DIR/"
sh_c ssh "$CI_D2_LINUX_AMD64" \
"D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE-}" \
"RELEASE=${RELEASE-}" \

8
ci/release/docker/build.sh
View file

@ -42,8 +42,12 @@ main() {
D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE:-terrastruct/d2}
sh_c mkdir -p "./ci/release/build/$VERSION/docker"
sh_c cp "./ci/release/build/$VERSION/d2-$VERSION"-linux-*.tar.gz "./ci/release/build/$VERSION/docker/"
sh_c cp ./ci/release/docker/entrypoint.sh "./ci/release/build/$VERSION/docker/entrypoint.sh"
sh_c cp \
"./ci/release/build/$VERSION/d2-$VERSION"-linux-*.tar.gz \
"./ci/release/build/$VERSION/docker/"
sh_c cp \
./ci/release/docker/entrypoint.sh \
"./ci/release/build/$VERSION/docker/entrypoint.sh"
flags='--load'
if [ -n "${PUSH-}" -o -n "${RELEASE-}" ]; then