From 4c7b4ee7dee63122b22a3642b3e73e0b0b6d44bb Mon Sep 17 00:00:00 2001 From: jamesread Date: Fri, 26 Nov 2021 19:39:54 +0000 Subject: [PATCH] cicd: Build armv6 package, remove docker from arm builds to speed things up. --- .goreleaser.yml | 1 + Dockerfile | 2 +- Dockerfile.arm64 | 3 +-- Dockerfile.armv7 | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 42a753c..6cf35c4 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -18,6 +18,7 @@ builds: goarm: - 5 # For old RPIs + - 6 - 7 main: cmd/OliveTin/main.go diff --git a/Dockerfile b/Dockerfile index ccf36e7..1decbc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /config /var/www/olivetin \ openssh-clients \ docker \ && dnf clean all && \ - rm -rf /var/cache/yum + rm -rf /var/cache/dnf EXPOSE 1337/tcp diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index f5a6de8..20b21f1 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -7,9 +7,8 @@ RUN mkdir -p /config /var/www/olivetin \ dnf install -y \ iputils \ openssh-clients \ - docker \ && dnf clean all && \ - rm -rf /var/cache/yum + rm -rf /var/cache/dnf EXPOSE 1337/tcp diff --git a/Dockerfile.armv7 b/Dockerfile.armv7 index 9424896..eac155e 100644 --- a/Dockerfile.armv7 +++ b/Dockerfile.armv7 @@ -7,9 +7,8 @@ RUN mkdir -p /config /var/www/olivetin \ dnf install -y \ iputils \ openssh-clients \ - docker \ && dnf clean all && \ - rm -rf /var/cache/yum + rm -rf /var/cache/dnf EXPOSE 1337/tcp