diff --git a/deployment/stub_profile.sh b/deployment/stub_profile.sh index 1804567..f4a9d74 100755 --- a/deployment/stub_profile.sh +++ b/deployment/stub_profile.sh @@ -82,8 +82,6 @@ EOF fi -. ./target.sh - # if VIRTUAL_MACHINE=base, then we doing the base image. if [ "$VIRTUAL_MACHINE" = base ]; then # this is for the base image only... @@ -142,9 +140,6 @@ EOF { "registry-mirrors": [ "${REGISTRY_URL}" - ], - "labels": [ - "PROJECT_COMMIT=${TARGET_PROJECT_GIT_COMMIT}" ] } @@ -160,7 +155,7 @@ if [ "$VIRTUAL_MACHINE" = base ]; then runcmd: - sudo mkdir -m 0755 -p /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg - - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list + - echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu jammy stable" | sudo tee /etc/apt/sources.list.d/docker.list - sudo apt-get update - sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y openssh-server diff --git a/deployment/target.sh b/deployment/target.sh deleted file mode 100755 index 635af9d..0000000 --- a/deployment/target.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -export TARGET_PROJECT_GIT_COMMIT=ca069c7decdc74d2719a7f34927bda49159da2ae \ No newline at end of file diff --git a/deployment/up.sh b/deployment/up.sh index 5f6c300..9571373 100755 --- a/deployment/up.sh +++ b/deployment/up.sh @@ -3,8 +3,6 @@ set -exu cd "$(dirname "$0")" -. ./target.sh - # check to ensure dependencies are met. for cmd in wait-for-it dig rsync sshfs incus; do if ! command -v "$cmd" >/dev/null 2>&1; then