From 8f937ea980471cfb2498c297f27a1a001783fb39 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 18 May 2022 09:09:38 +0100 Subject: [PATCH] chore: remove support for arch images (#161) --- .github/workflows/build.yaml | 1 - images/base/Dockerfile.arch | 48 ------------------------------------ scripts/build_images.sh | 2 +- scripts/push_images.sh | 2 +- 4 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 images/base/Dockerfile.arch diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2827cee..8bce767 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -64,7 +64,6 @@ jobs: strategy: matrix: job: - - arch - centos - ubuntu fail-fast: false diff --git a/images/base/Dockerfile.arch b/images/base/Dockerfile.arch deleted file mode 100644 index 71f6f99..0000000 --- a/images/base/Dockerfile.arch +++ /dev/null @@ -1,48 +0,0 @@ -FROM archlinux/archlinux:base-20210205.0.15146 - -SHELL ["/bin/bash", "-c"] - -# Workaround broken upstream archive by pinning to older snapshot -COPY mirrorlist /etc/pacman.d/mirrorlist - -# Install baseline packages -RUN pacman --noconfirm -Syyuu \ - base \ - base-devel \ - bash \ - ca-certificates \ - curl \ - docker \ - git \ - htop \ - man \ - openssh \ - python3 \ - sudo \ - unzip \ - vim \ - wget && \ - # Delete package cache to avoid consuming space in layer - pacman --noconfirm -Scc - -# Enables Docker starting with systemd -RUN systemctl enable docker - -# Add docker-compose -RUN curl -L "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose -RUN chmod +x /usr/local/bin/docker-compose - -# Add coder user. -RUN useradd coder \ - --create-home \ - --shell=/bin/bash \ - --groups=docker \ - --uid=1000 \ - --user-group && \ - echo "coder ALL=(ALL) NOPASSWD:ALL" >>/etc/sudoers.d/nopasswd - -USER coder - -# install Homebrew, must be as a non-root user -RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" -ENV PATH /home/linuxbrew/.linuxbrew/bin:${PATH} diff --git a/scripts/build_images.sh b/scripts/build_images.sh index fb7b6a9..bb8c3d1 100755 --- a/scripts/build_images.sh +++ b/scripts/build_images.sh @@ -25,7 +25,7 @@ function usage() { echo " --dry-run Show commands that would run, but" echo " do not run them" echo " --tag= Select an image tag group to build," - echo " one of: arch, centos, ubuntu)" + echo " one of: centos, ubuntu)" echo " --quiet Suppress container build output" exit 1 } diff --git a/scripts/push_images.sh b/scripts/push_images.sh index d97317e..17eefc7 100755 --- a/scripts/push_images.sh +++ b/scripts/push_images.sh @@ -25,7 +25,7 @@ function usage() { echo " --dry-run Show commands that would run, but" echo " do not run them" echo " --tag= Select an image tag group to build," - echo " one of: arch, centos, ubuntu)" + echo " one of: centos, ubuntu)" echo " --quiet Suppress container build output" exit 1 }