From e990ecfeb4d5a82606570142eea95bebf26277d0 Mon Sep 17 00:00:00 2001 From: gyurix Date: Fri, 12 Jun 2026 09:07:00 +0200 Subject: [PATCH] updated drone steps --- .drone.yml | 47 ++++++++++++++++++++-------- .drone.yml.old | 48 +++++++++++++++++++++++++++++ Dockerfile | 27 +++++++++++++--- Dockerfile.old | 5 +++ network-go/.drone.yml | 71 ------------------------------------------- network-go/Dockerfile | 24 --------------- 6 files changed, 111 insertions(+), 111 deletions(-) create mode 100644 .drone.yml.old create mode 100644 Dockerfile.old delete mode 100644 network-go/.drone.yml delete mode 100644 network-go/Dockerfile diff --git a/.drone.yml b/.drone.yml index 22ebdeb..e6ad87e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,4 @@ +--- kind: pipeline type: kubernetes name: default @@ -10,39 +11,61 @@ trigger: - master event: - push + workspace: - path: /drone/src + path: /drone/src/network-go steps: - - name: build multiarch from dev + - name: test + image: docker.io/library/golang:1.26-alpine + pull: always + commands: + - apk add --no-cache git + - cd /drone/src/network-go + - go mod download + - go test ./... -count=1 -v + + - name: build + image: docker.io/library/golang:1.26-alpine + pull: always + commands: + - apk add --no-cache git + - cd /drone/src/network-go + - go build -o network-go -ldflags="-s -w" . + + - name: build-multiarch image: docker.io/owncloudci/drone-docker-buildx:4 privileged: true settings: - cache-from: [ "registry.dev.format.hu/firewall" ] + cache-from: + - registry.dev.format.hu/network-go registry: registry.dev.format.hu - repo: registry.dev.format.hu/firewall + repo: registry.dev.format.hu/network-go tags: latest dockerfile: Dockerfile + context: . username: from_secret: dev-hu-registry-username - password: + password: from_secret: dev-hu-registry-password platforms: - linux/amd64 - linux/arm64 - - - name: pull image to dockerhub + + - name: push-to-dockerhub image: docker.io/owncloudci/drone-docker-buildx:4 privileged: true settings: - cache-from: [ "safebox/firewall" ] - repo: safebox/firewall + cache-from: + - safebox/network-go + repo: safebox/network-go tags: latest + dockerfile: Dockerfile + context: . username: from_secret: dockerhub-username - password: + password: from_secret: dockerhub-password platforms: - linux/amd64 - - linux/arm64 - + - linux/arm64 \ No newline at end of file diff --git a/.drone.yml.old b/.drone.yml.old new file mode 100644 index 0000000..22ebdeb --- /dev/null +++ b/.drone.yml.old @@ -0,0 +1,48 @@ +kind: pipeline +type: kubernetes +name: default + +node_selector: + physical-node: dev1 + +trigger: + branch: + - master + event: + - push +workspace: + path: /drone/src + +steps: + - name: build multiarch from dev + image: docker.io/owncloudci/drone-docker-buildx:4 + privileged: true + settings: + cache-from: [ "registry.dev.format.hu/firewall" ] + registry: registry.dev.format.hu + repo: registry.dev.format.hu/firewall + tags: latest + dockerfile: Dockerfile + username: + from_secret: dev-hu-registry-username + password: + from_secret: dev-hu-registry-password + platforms: + - linux/amd64 + - linux/arm64 + + - name: pull image to dockerhub + image: docker.io/owncloudci/drone-docker-buildx:4 + privileged: true + settings: + cache-from: [ "safebox/firewall" ] + repo: safebox/firewall + tags: latest + username: + from_secret: dockerhub-username + password: + from_secret: dockerhub-password + platforms: + - linux/amd64 + - linux/arm64 + diff --git a/Dockerfile b/Dockerfile index b3e010e..fd48096 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,24 @@ -FROM alpine +# Build stage +FROM docker.io/library/golang:1.26-alpine AS builder -RUN apk add --update --no-cache iptables iptables-legacy openssl jq curl ca-certificates busybox-extras docker-cli -COPY firewall/ /firewall/ -CMD firewall/iptables-wrapper-installer.sh && /firewall/firewall-add +WORKDIR /build +COPY go.mod go.sum ./ +RUN go mod download + +COPY . . +RUN go build -o network-go -ldflags="-s -w" . + +# Runtime stage +FROM docker.io/library/alpine:latest + +RUN apk add --update --no-cache \ + iptables \ + iptables-legacy \ + ca-certificates \ + util-linux \ + nsenter \ + && rm -rf /var/cache/apk/* + +COPY --from=builder /build/network-go /usr/local/bin/network-go + +CMD ["/usr/local/bin/network-go"] \ No newline at end of file diff --git a/Dockerfile.old b/Dockerfile.old new file mode 100644 index 0000000..b3e010e --- /dev/null +++ b/Dockerfile.old @@ -0,0 +1,5 @@ +FROM alpine + +RUN apk add --update --no-cache iptables iptables-legacy openssl jq curl ca-certificates busybox-extras docker-cli +COPY firewall/ /firewall/ +CMD firewall/iptables-wrapper-installer.sh && /firewall/firewall-add diff --git a/network-go/.drone.yml b/network-go/.drone.yml deleted file mode 100644 index e6ad87e..0000000 --- a/network-go/.drone.yml +++ /dev/null @@ -1,71 +0,0 @@ ---- -kind: pipeline -type: kubernetes -name: default - -node_selector: - physical-node: dev1 - -trigger: - branch: - - master - event: - - push - -workspace: - path: /drone/src/network-go - -steps: - - name: test - image: docker.io/library/golang:1.26-alpine - pull: always - commands: - - apk add --no-cache git - - cd /drone/src/network-go - - go mod download - - go test ./... -count=1 -v - - - name: build - image: docker.io/library/golang:1.26-alpine - pull: always - commands: - - apk add --no-cache git - - cd /drone/src/network-go - - go build -o network-go -ldflags="-s -w" . - - - name: build-multiarch - image: docker.io/owncloudci/drone-docker-buildx:4 - privileged: true - settings: - cache-from: - - registry.dev.format.hu/network-go - registry: registry.dev.format.hu - repo: registry.dev.format.hu/network-go - tags: latest - dockerfile: Dockerfile - context: . - username: - from_secret: dev-hu-registry-username - password: - from_secret: dev-hu-registry-password - platforms: - - linux/amd64 - - linux/arm64 - - - name: push-to-dockerhub - image: docker.io/owncloudci/drone-docker-buildx:4 - privileged: true - settings: - cache-from: - - safebox/network-go - repo: safebox/network-go - tags: latest - dockerfile: Dockerfile - context: . - username: - from_secret: dockerhub-username - password: - from_secret: dockerhub-password - platforms: - - linux/amd64 - - linux/arm64 \ No newline at end of file diff --git a/network-go/Dockerfile b/network-go/Dockerfile deleted file mode 100644 index fd48096..0000000 --- a/network-go/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Build stage -FROM docker.io/library/golang:1.26-alpine AS builder - -WORKDIR /build -COPY go.mod go.sum ./ -RUN go mod download - -COPY . . -RUN go build -o network-go -ldflags="-s -w" . - -# Runtime stage -FROM docker.io/library/alpine:latest - -RUN apk add --update --no-cache \ - iptables \ - iptables-legacy \ - ca-certificates \ - util-linux \ - nsenter \ - && rm -rf /var/cache/apk/* - -COPY --from=builder /build/network-go /usr/local/bin/network-go - -CMD ["/usr/local/bin/network-go"] \ No newline at end of file