revert

2021-01-16 22:28:43 +01:00 · 2021-01-16 22:28:43 +01:00 · 547dccda53
parent 671755636d
commit 547dccda53
5 changed files with 4 additions and 102 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -306,7 +306,6 @@ local PipelineNotifications = {
    'build-binaries',
    'build-container-amd64',
    'build-container-arm64',
-    'build-container-arm',
  ],
  trigger: {
    ref: ['refs/heads/main', 'refs/tags/**'],
@ -319,6 +318,5 @@ local PipelineNotifications = {
  PipelineBuildBinaries,
  PipelineBuildContainer(arch='amd64'),
  PipelineBuildContainer(arch='arm64'),
-  PipelineBuildContainer(arch='arm'),
  PipelineNotifications,
 ]
--- a/.drone.yml
+++ b/.drone.yml
@ -284,92 +284,6 @@ trigger:
 depends_on:
 - test

---
-kind: pipeline
-name: build-container-arm
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build
-  image: golang:1.15
-  commands:
-  - "[ -z \"${DRONE_TAG}\" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}"
-  - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/arm/drone-docker-buildx ./cmd/drone-docker-buildx
-
- name: dryrun
-  image: plugins/docker:19
-  settings:
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm
-    dry_run: true
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/pull/**
-  depends_on:
-  - build
-
- name: publish-dockerhub
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: arm
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
- name: publish-quay
-  image: plugins/docker:19
-  settings:
-    auto_tag: true
-    auto_tag_suffix: arm
-    config:
-      from_secret: docker_config
-    dockerfile: docker/Dockerfile.arm
-    password:
-      from_secret: quay_password
-    registry: quay.io
-    repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: quay_username
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - dryrun
-
-image_pull_secrets:
- docker_config
-
-trigger:
-  ref:
-  - refs/heads/main
-  - refs/tags/**
-  - refs/pull/**
-
-depends_on:
- test
-
 ---
 kind: pipeline
 name: notifications
@ -464,10 +378,9 @@ depends_on:
 - build-binaries
 - build-container-amd64
 - build-container-arm64
- build-container-arm

 ---
 kind: signature
-hmac: cfe8c21cadc3fd45a3abd914a3767e2d5025ee9836791f71d4f620de1f9461ab
+hmac: f3927845c8739c33bd85d97dc6a81e73b88de2bfb4e592b6943db9e890bb4d47

 ...
--- a/docker/Dockerfile.amd64
+++ b/docker/Dockerfile.amd64
@ -1,4 +1,4 @@
-FROM amd64/docker:19.03-dind
+FROM amd64/docker:20.10-dind@sha256:12521ff42db0d1e1d99f89c7dea6aa6e2d028c20cb42dad8285503735ddf678d

 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -16,9 +16,6 @@ ENV DOCKER_HOST=unix:///var/run/docker.sock
 RUN apk --update add --virtual .build-deps curl && \
    mkdir -p /usr/lib/docker/cli-plugins/ && \
    curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-amd64" && \
-    curl -SsL -o /var/lib/docker/default.json https://github.com/moby/moby/blob/19.03/profiles/seccomp/default.json && \
-    sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /var/lib/docker/default.json && \
-    chmod 600 /var/lib/docker/default.json && \
    chmod 755 /usr/lib/docker/cli-plugins/docker-buildx && \
    apk del .build-deps && \
    rm -rf /var/cache/apk/* && \
--- a/docker/Dockerfile.arm
+++ b/docker/Dockerfile.arm
@ -1,4 +1,4 @@
-FROM arm32v7/docker:19.03-dind
+FROM arm32v7/docker:20.10-dind

 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -16,9 +16,6 @@ ENV DOCKER_HOST=unix:///var/run/docker.sock
 RUN apk --update add --virtual .build-deps curl && \
    mkdir -p /usr/lib/docker/cli-plugins/ && \
    curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-amd64" && \
-    curl -SsL -o /var/lib/docker/default.json https://github.com/moby/moby/blob/19.03/profiles/seccomp/default.json && \
-    sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /var/lib/docker/default.json && \
-    chmod 600 /var/lib/docker/default.json && \
    chmod 755 /usr/lib/docker/cli-plugins/docker-buildx && \
    apk del .build-deps && \
    rm -rf /var/cache/apk/* && \
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@ -1,4 +1,4 @@
-FROM arm64v8/docker:19.03-dind
+FROM arm64v8/docker:20.10-dind@sha256:009bdea1b7cf4de7f5f7febf8cce1f322b92598927318c78cd2c012d8c0dc866

 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -16,9 +16,6 @@ ENV DOCKER_HOST=unix:///var/run/docker.sock
 RUN apk --update add --virtual .build-deps curl && \
    mkdir -p /usr/lib/docker/cli-plugins/ && \
    curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-amd64" && \
-    curl -SsL -o /var/lib/docker/default.json https://github.com/moby/moby/blob/19.03/profiles/seccomp/default.json && \
-    sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /var/lib/docker/default.json && \
-    chmod 600 /var/lib/docker/default.json && \
    chmod 755 /usr/lib/docker/cli-plugins/docker-buildx && \
    apk del .build-deps && \
    rm -rf /var/cache/apk/* && \