diff --git a/pkg/adlin-tuto1/build.yml b/pkg/adlin-tuto1/build.yml index af8f064..876c7a6 100644 --- a/pkg/adlin-tuto1/build.yml +++ b/pkg/adlin-tuto1/build.yml @@ -1,4 +1,5 @@ image: adlin-tuto1 +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/arp-spoofer/build.yml b/pkg/arp-spoofer/build.yml index aea7ea1..bf4d83e 100644 --- a/pkg/arp-spoofer/build.yml +++ b/pkg/arp-spoofer/build.yml @@ -1,4 +1,5 @@ image: adlin-arp-spoofer +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/awx_web/build.yml b/pkg/awx_web/build.yml index eede9a5..b95e76e 100644 --- a/pkg/awx_web/build.yml +++ b/pkg/awx_web/build.yml @@ -1,4 +1,5 @@ image: awx_web +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/challenge/build.yml b/pkg/challenge/build.yml index 8cf36e6..cb0d53c 100644 --- a/pkg/challenge/build.yml +++ b/pkg/challenge/build.yml @@ -1,4 +1,5 @@ image: challenge +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/chrony/build.yml b/pkg/chrony/build.yml index 52bda48..c4ff1b6 100644 --- a/pkg/chrony/build.yml +++ b/pkg/chrony/build.yml @@ -1,4 +1,5 @@ image: chrony +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/debian-tuto2/build.yml b/pkg/debian-tuto2/build.yml index 4f5c1d6..ab61538 100644 --- a/pkg/debian-tuto2/build.yml +++ b/pkg/debian-tuto2/build.yml @@ -1,4 +1,5 @@ image: adlin-tuto2 +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/debian-tuto3/build.yml b/pkg/debian-tuto3/build.yml index e6fa19f..4de4dc1 100644 --- a/pkg/debian-tuto3/build.yml +++ b/pkg/debian-tuto3/build.yml @@ -1,4 +1,5 @@ image: adlin-tuto3 +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/debug/build.yml b/pkg/debug/build.yml index 552c3f0..151102b 100644 --- a/pkg/debug/build.yml +++ b/pkg/debug/build.yml @@ -1,4 +1,5 @@ image: debug +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/iscsi-target/build.yml b/pkg/iscsi-target/build.yml index 7929b3c..af84abb 100644 --- a/pkg/iscsi-target/build.yml +++ b/pkg/iscsi-target/build.yml @@ -1,4 +1,5 @@ image: iscsi-target +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/login-app/Dockerfile b/pkg/login-app/Dockerfile index 8a3e552..e4c60e6 100644 --- a/pkg/login-app/Dockerfile +++ b/pkg/login-app/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.15 as gobuild +FROM golang:1.19-alpine as gobuild ENV GOOS linux ENV GOARCH amd64 diff --git a/pkg/login-app/build.yml b/pkg/login-app/build.yml index 8568fbe..9c90238 100644 --- a/pkg/login-app/build.yml +++ b/pkg/login-app/build.yml @@ -1,4 +1,5 @@ image: adlin-login-app +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/login-app/cmd/login-app b/pkg/login-app/cmd/login-app deleted file mode 100755 index 62b51b3..0000000 Binary files a/pkg/login-app/cmd/login-app and /dev/null differ diff --git a/pkg/login-validator/Dockerfile b/pkg/login-validator/Dockerfile index 5607b68..e5c1f02 100644 --- a/pkg/login-validator/Dockerfile +++ b/pkg/login-validator/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.15 as gobuild +FROM golang:1.19-alpine as gobuild RUN apk add --no-cache git diff --git a/pkg/login-validator/build.yml b/pkg/login-validator/build.yml index 5dcc4bf..b42d4de 100644 --- a/pkg/login-validator/build.yml +++ b/pkg/login-validator/build.yml @@ -1,4 +1,5 @@ image: adlin-login-validator +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/minichecker/Dockerfile b/pkg/minichecker/Dockerfile index be43738..29923ce 100644 --- a/pkg/minichecker/Dockerfile +++ b/pkg/minichecker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.15 as gobuild +FROM golang:1.19-alpine as gobuild ENV GOOS linux ENV GOARCH amd64 diff --git a/pkg/minichecker/build.yml b/pkg/minichecker/build.yml index 9d2d162..bce9690 100644 --- a/pkg/minichecker/build.yml +++ b/pkg/minichecker/build.yml @@ -1,4 +1,5 @@ image: minichecker +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/monit/build.yml b/pkg/monit/build.yml index c5dd087..60fd090 100644 --- a/pkg/monit/build.yml +++ b/pkg/monit/build.yml @@ -1,4 +1,5 @@ image: monit +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/nsd/build.yml b/pkg/nsd/build.yml index 75f0284..9edfd9c 100644 --- a/pkg/nsd/build.yml +++ b/pkg/nsd/build.yml @@ -1,4 +1,5 @@ image: nsd +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/postfix/build.yml b/pkg/postfix/build.yml index 3da2e9b..d3fce0e 100644 --- a/pkg/postfix/build.yml +++ b/pkg/postfix/build.yml @@ -1,4 +1,5 @@ image: postfix +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/resolver/build.yml b/pkg/resolver/build.yml index e8314fe..5fd25c2 100644 --- a/pkg/resolver/build.yml +++ b/pkg/resolver/build.yml @@ -1,4 +1,5 @@ image: resolver +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/router-tuto3/Dockerfile b/pkg/router-tuto3/Dockerfile index 65760e3..d6b51d1 100644 --- a/pkg/router-tuto3/Dockerfile +++ b/pkg/router-tuto3/Dockerfile @@ -1,4 +1,4 @@ -FROM openwrtorg/rootfs:x86-64-21.02.2 +FROM openwrtorg/rootfs:x86-64-22.03.3 RUN mkdir -p /var/lock/ && opkg update && opkg install \ bind-dig \ diff --git a/pkg/router-tuto3/build.yml b/pkg/router-tuto3/build.yml index be89342..282ae3c 100644 --- a/pkg/router-tuto3/build.yml +++ b/pkg/router-tuto3/build.yml @@ -1,4 +1,5 @@ image: router-tuto3 +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/shadow-up/Dockerfile b/pkg/shadow-up/Dockerfile index 57e4bca..5814f81 100644 --- a/pkg/shadow-up/Dockerfile +++ b/pkg/shadow-up/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.15 as gobuild +FROM golang:1.19-alpine as gobuild ENV GOOS linux ENV GOARCH amd64 diff --git a/pkg/shadow-up/build.yml b/pkg/shadow-up/build.yml index 313c447..3f3b996 100644 --- a/pkg/shadow-up/build.yml +++ b/pkg/shadow-up/build.yml @@ -1,4 +1,5 @@ image: adlin-shadow-up +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/tftpd/build.yml b/pkg/tftpd/build.yml index d84395f..2d26995 100644 --- a/pkg/tftpd/build.yml +++ b/pkg/tftpd/build.yml @@ -1,4 +1,5 @@ image: tftpd +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/tinydeb/build.yml b/pkg/tinydeb/build.yml index 4b76a93..8f1d96d 100644 --- a/pkg/tinydeb/build.yml +++ b/pkg/tinydeb/build.yml @@ -1,4 +1,5 @@ image: tinydeb +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/unbound/build.yml b/pkg/unbound/build.yml index 74febfd..2281af9 100644 --- a/pkg/unbound/build.yml +++ b/pkg/unbound/build.yml @@ -1,4 +1,5 @@ image: unbound +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/wg-manager/Dockerfile b/pkg/wg-manager/Dockerfile index cc7a516..2fb5f42 100644 --- a/pkg/wg-manager/Dockerfile +++ b/pkg/wg-manager/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.15 as gobuild +FROM golang:1.19-alpine as gobuild RUN apk add --no-cache git diff --git a/pkg/wg-manager/build.yml b/pkg/wg-manager/build.yml index 66f98f6..b809b55 100644 --- a/pkg/wg-manager/build.yml +++ b/pkg/wg-manager/build.yml @@ -1,4 +1,5 @@ image: wg-manager +org: nemunaire network: true arches: -- x86_64 +- amd64 diff --git a/pkg/wg/Dockerfile b/pkg/wg/Dockerfile index da93fce..6f0093a 100644 --- a/pkg/wg/Dockerfile +++ b/pkg/wg/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror +FROM linuxkit/alpine:316c3f9d85c21fdd8bc7479e81d290f85bf60eb0 AS mirror RUN mkdir -p /out/etc/apk /out/usr/bin && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ diff --git a/pkg/wg/build.yml b/pkg/wg/build.yml index 89785bd..5bbd324 100644 --- a/pkg/wg/build.yml +++ b/pkg/wg/build.yml @@ -1,7 +1,8 @@ image: wg +org: nemunaire network: true arches: -- x86_64 +- amd64 config: capabilities: - CAP_NET_ADMIN