Build separate debug image. Switch from kaniko to buildah.

This commit is contained in:
Daniel Lundin
2019-10-02 10:26:38 +02:00
parent 4f8bf01f4a
commit 6f1e923c9a
4 changed files with 22 additions and 18 deletions
+5 -14
View File
@@ -3,17 +3,8 @@ steps:
agents:
queue: default
os: linux
plugins:
- EmbarkStudios/k8s#1.1.0:
image: gcr.io/kaniko-project/executor:latest
command:
- --destination=embarkstudios/wireguard-ui
- --context=/build
- --reproducible
- --cache=true
- --cache-repo=kaniko-cache.buildkite.svc.cluster.local/kaniko/cache
- --cache-dir=/cache
mount-secret:
- docker-hub-credentials:/kaniko/.docker
mount-hostpath:
- /mnt/disks/ssd0/cache/kaniko:/cache
commands:
- buildah bud --layers -t embarkstudios/wireguard-ui:latest -f Dockerfile .
- buildah bud --layers -t embarkstudios/wireguard-ui:debug -f Dockerfile.debug .
- buildah push embarkstudios/wireguard-ui:latest
- buildah push embarkstudios/wireguard-ui:debug
+4 -3
View File
@@ -1,10 +1,11 @@
FROM node:12-alpine AS ui
WORKDIR /ui
COPY ui .
COPY package.json package-lock.json /ui/
RUN npm install
COPY ui .
RUN npm run build
FROM golang:1.12 AS build
FROM golang:1.13 AS build
WORKDIR /wg
RUN go get github.com/go-bindata/go-bindata/... &&\
go get github.com/elazarl/go-bindata-assetfs/...
@@ -16,6 +17,6 @@ COPY --from=ui /ui/public ui/public
RUN go-bindata-assetfs -prefix ui/public ui/public &&\
go install .
FROM gcr.io/distroless/base:debug
FROM gcr.io/distroless/base
COPY --from=build /go/bin/wireguard-ui /
ENTRYPOINT [ "/wireguard-ui" ]
+12
View File
@@ -0,0 +1,12 @@
FROM embarkstudios/wireguard-ui AS latest
FROM ubuntu
RUN apt-get update -y && \
apt-get install -y software-properties-common iptables curl iproute2 ifupdown iputils-ping && \
echo resolvconf resolvconf/linkify-resolvconf boolean false | debconf-set-selections && \
echo "REPORT_ABSENT_SYMLINK=no" >> /etc/default/resolvconf && \
add-apt-repository --yes ppa:wireguard/wireguard && \
apt-get install resolvconf
RUN apt-get install -qy --no-install-recommends wireguard-tools
COPY --from=latest /wireguard-ui /
ENTRYPOINT [ "/wireguard-ui" ]
+1 -1
View File
@@ -137,7 +137,7 @@ func (s *Server) initInterface() error {
conn := nftables.Conn{NetNS: int(ns)}
log.Debug("Flushing nftable rulesets")
// conn.FlushRuleset()
conn.FlushRuleset()
log.Debug("Setting up nftable rules for ip masquerading")