diff --git a/Dockerfile b/Dockerfile index 72f25dd..a7717fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:labs -FROM ubuntu:rolling as preinstall +FROM public.ecr.aws/ubuntu/ubuntu:focal as preinstall RUN apt-get update && apt-get install -y curl python3-minimal FROM preinstall as base diff --git a/justfile b/justfile index b65fd18..fab9425 100644 --- a/justfile +++ b/justfile @@ -4,7 +4,7 @@ DOCKER := if env_var_or_default("USE_PODMAN", "no") == "yes" { "podman" } else { BYPASS4NS := if env_var_or_default("USE_LIMA", "no") == "yes" { "--label nerdctl/bypass4ns=true" } else { "" } ARCH := if arch() == "aarch64" { "arm64" } else { "x64" } -docker-build: docker-update +docker-build: {{ DOCKER }} build --build-arg ARCH="{{ARCH}}" -t iosevka . docker-run: docker-build @@ -14,6 +14,3 @@ clone: git clone http://github.com/be5invis/iosevka wormhole: docker-run - -docker-update: - {{ DOCKER }} pull ubuntu:rolling