diff --git a/build.sh b/build.sh index 74d3d9d..73adf9c 100755 --- a/build.sh +++ b/build.sh @@ -8,8 +8,8 @@ YOU_ARE_HERE="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" # container will be useless unless we bundle the actual OS test -f "$YOU_ARE_HERE"/container/hdd/hdd.img -# this image is private on Google Cloud Registry, make sure we're logged in -gcloud auth configure-docker +# this image is private on DigitalOcean, make sure we're logged in +doctl registry login -docker build -t gcr.io/jakejarvis/y2k:latest --no-cache "$YOU_ARE_HERE" -docker push gcr.io/jakejarvis/y2k:latest +docker build -t registry.digitalocean.com/jakejarvis/y2k:latest --no-cache "$YOU_ARE_HERE" +docker push registry.digitalocean.com/jakejarvis/y2k:latest diff --git a/host/install.sh b/host/install.sh index 9d8920e..7a5f810 100755 --- a/host/install.sh +++ b/host/install.sh @@ -64,20 +64,14 @@ cloudflared service install cp ~/.cloudflared/cert.pem /etc/cloudflared/ rm ~/.cloudflared/cert.pem -#### install Google Cloud Registry credential helper #### -## https://cloud.google.com/container-registry/docs/advanced-authentication#standalone-helper -## https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases -GCR_HELPER_VERSION=2.0.2 -curl -fsSL https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v${GCR_HELPER_VERSION}/docker-credential-gcr_linux_amd64-${GCR_HELPER_VERSION}.tar.gz | tar xz --to-stdout ./docker-credential-gcr > /usr/local/bin/docker-credential-gcr -chmod +x /usr/local/bin/docker-credential-gcr -docker-credential-gcr version - -#### login to GCR #### -docker-credential-gcr gcr-login -docker-credential-gcr configure-docker +#### login to DO registry #### +snap install doctl +snap connect doctl:dot-docker +doctl auth init +doctl registry login #### pull OS container #### -docker pull gcr.io/jakejarvis/y2k:latest +docker pull registry.digitalocean.com/jakejarvis/y2k:latest #### enable services #### cp $REPO_DIR/host/example.service /lib/systemd/system/y2k.service diff --git a/host/socket.sh b/host/socket.sh index a8d0016..3045c64 100755 --- a/host/socket.sh +++ b/host/socket.sh @@ -12,7 +12,7 @@ --network none \ --log-driver none \ --rm -i \ - gcr.io/jakejarvis/y2k:latest + registry.digitalocean.com/jakejarvis/y2k:latest # to spawn QEMU processes natively on the host machine instead of via # individual Docker containers: