fix
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

This commit is contained in:
Jeffrey Paul 2022-11-28 02:06:30 +01:00
parent 2cb70e2fe7
commit b78ec08cd1
2 changed files with 18 additions and 20 deletions

View File

@ -1,19 +1,17 @@
kind: pipeline kind: pipeline
name: test-docker-build name: test-docker-build
steps: steps:
- name: test-docker-build - name: test
#image: plugins/docker image: docker:dind
image: plugins/kaniko volumes:
settings: - name: dockersock
dry_run: true path: /var/run/docker.sock
repo: test/test commands:
target: final #- echo nameserver 116.202.204.30 > /etc/resolv.conf
custom_dns: [ 116.202.204.30 ] - docker build -t sneak/gohttpserver .
username: volumes:
from_secret: registry_username - name: dockersock
password: host:
from_secret: registry_password path: /var/run/docker.sock
tags:
- ${DRONE_COMMIT_SHA}
- ${DRONE_BRANCH}

View File

@ -1,5 +1,5 @@
## lint image ## lint image
FROM golangci/golangci-lint@sha256:9ae3767101cd3468cdaea5b6573dadb358013e05ac38abe37d53646680fd386c AS linter FROM golangci/golangci-lint:v1.50.1
RUN mkdir -p /build RUN mkdir -p /build
WORKDIR /build WORKDIR /build
@ -7,7 +7,7 @@ COPY ./ ./
RUN golangci-lint run RUN golangci-lint run
## build image: ## build image:
FROM golang:1.15-buster AS builder FROM golang:1.19.3-bullseye AS builder
RUN apt update && apt install -y make bzip2 RUN apt update && apt install -y make bzip2
@ -20,14 +20,14 @@ RUN go mod download
COPY ./ ./ COPY ./ ./
#RUN make lint #RUN make lint
RUN make rice-install && make httpd RUN make httpd && mv ./httpd /httpd
RUN go mod vendor RUN go mod vendor
RUN tar -c . | bzip2 > /src.tbz2 RUN tar -c . | bzip2 > /src.tbz2
## output image: ## output image:
FROM debian:buster-slim AS final FROM debian:bullseye-slim AS final
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /build/httpd /app/httpd COPY --from=builder /httpd /app/httpd
COPY --from=builder /src.tbz2 /usr/local/src/src.tbz2 COPY --from=builder /src.tbz2 /usr/local/src/src.tbz2