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