Browse Source

Merge pull request #976 from gravitl/docker_v0.12.2_update

updated docker versions
dcarns 3 years ago
parent
commit
627f63a193

+ 2 - 2
Dockerfile

@@ -1,5 +1,5 @@
 #first stage - builder
 #first stage - builder
-FROM golang:1.17-alpine as builder
+FROM golang:1.18.0-alpine3.15 as builder
 ARG version 
 ARG version 
 RUN apk add build-base
 RUN apk add build-base
 WORKDIR /app
 WORKDIR /app
@@ -7,7 +7,7 @@ COPY . .
 ENV GO111MODULE=auto
 ENV GO111MODULE=auto
 
 
 RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=${version}'" -o netmaker main.go
 RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=${version}'" -o netmaker main.go
-FROM alpine:3.14.3
+FROM alpine:3.15.2
 
 
 # add a c lib
 # add a c lib
 RUN apk add gcompat iptables wireguard-tools
 RUN apk add gcompat iptables wireguard-tools

+ 1 - 1
compose/docker-compose.contained.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
 services:
   netmaker:
   netmaker:
     container_name: netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.12.1
+    image: gravitl/netmaker:v0.12.2
     volumes:
     volumes:
       - dnsconfig:/root/config/dnsconfig
       - dnsconfig:/root/config/dnsconfig
       - sqldata:/root/data
       - sqldata:/root/data

+ 1 - 1
compose/docker-compose.hostnetwork.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
 services:
   netmaker:
   netmaker:
     container_name: netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.12.1
+    image: gravitl/netmaker:v0.12.2
     volumes:
     volumes:
       - dnsconfig:/root/config/dnsconfig
       - dnsconfig:/root/config/dnsconfig
       - /usr/bin/wg:/usr/bin/wg
       - /usr/bin/wg:/usr/bin/wg

+ 1 - 1
compose/docker-compose.nocaddy.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
 services:
   netmaker:
   netmaker:
     container_name: netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.12.1
+    image: gravitl/netmaker:v0.12.2
     volumes:
     volumes:
       - dnsconfig:/root/config/dnsconfig
       - dnsconfig:/root/config/dnsconfig
       - sqldata:/root/data
       - sqldata:/root/data

+ 1 - 1
compose/docker-compose.nodns.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
 services:
   netmaker:
   netmaker:
     container_name: netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.12.1
+    image: gravitl/netmaker:v0.12.2
     volumes:
     volumes:
       - dnsconfig:/root/config/dnsconfig
       - dnsconfig:/root/config/dnsconfig
       - sqldata:/root/data
       - sqldata:/root/data

+ 1 - 1
compose/docker-compose.reference.yml

@@ -2,7 +2,7 @@ services:
   netmaker: # The Primary Server for running Netmaker
   netmaker: # The Primary Server for running Netmaker
     privileged: true # Necessary to run sudo/root level commands on host system. Likely using this if running with host networking on.
     privileged: true # Necessary to run sudo/root level commands on host system. Likely using this if running with host networking on.
     container_name: netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.12.1
+    image: gravitl/netmaker:v0.12.2
     volumes: # Volume mounts necessary for CLIENT_MODE to control wireguard networking on host (except dnsconfig, which is where dns config files are stored for use by CoreDNS)
     volumes: # Volume mounts necessary for CLIENT_MODE to control wireguard networking on host (except dnsconfig, which is where dns config files are stored for use by CoreDNS)
       - dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
       - dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
       - sqldata:/root/data
       - sqldata:/root/data

+ 1 - 1
compose/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
 services:
   netmaker:
   netmaker:
     container_name: netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.12.1
+    image: gravitl/netmaker:v0.12.2
     volumes:
     volumes:
       - dnsconfig:/root/config/dnsconfig
       - dnsconfig:/root/config/dnsconfig
       - sqldata:/root/data
       - sqldata:/root/data

+ 2 - 2
docker/Dockerfile-builder

@@ -1,8 +1,8 @@
-FROM alpine:3.13.6
+FROM alpine:3.15.2
 
 
 RUN apk add --no-cache --virtual .build-deps bash gcc musl-dev openssl go 
 RUN apk add --no-cache --virtual .build-deps bash gcc musl-dev openssl go 
 
 
-RUN wget -O go.tgz https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz 
+RUN wget -O go.tgz https://go.dev/dl/go1.18.linux-amd64.tar.gz
 
 
 RUN tar -C /usr/local -xzf go.tgz 
 RUN tar -C /usr/local -xzf go.tgz 
 
 

+ 1 - 1
docker/Dockerfile-netclient

@@ -8,7 +8,7 @@ ENV GO111MODULE=auto
 
 
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s" -o netclient-app netclient/main.go
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s" -o netclient-app netclient/main.go
 
 
-FROM alpine:3.13.6
+FROM alpine:3.15.2
 
 
 RUN apk add gcompat iptables && mkdir -p /etc/netclient
 RUN apk add gcompat iptables && mkdir -p /etc/netclient
 # set the working directory
 # set the working directory

+ 1 - 1
docker/Dockerfile-netclient-doks

@@ -3,7 +3,7 @@ FROM debian:buster as builder
 
 
 RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
 RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
 
 
-RUN wget -O go.tgz https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz
+RUN wget -O go.tgz https://go.dev/dl/go1.18.linux-amd64.tar.gz
 
 
 RUN tar -C /usr/local -xzf go.tgz
 RUN tar -C /usr/local -xzf go.tgz
 
 

+ 1 - 1
docker/Dockerfile-netclient-doks-uspace

@@ -3,7 +3,7 @@ FROM debian:buster as builder
 
 
 RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
 RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
 
 
-RUN wget -O go.tgz https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz
+RUN wget -O go.tgz https://go.dev/dl/go1.18.linux-amd64.tar.gz
 
 
 RUN tar -C /usr/local -xzf go.tgz
 RUN tar -C /usr/local -xzf go.tgz
 
 

+ 1 - 1
docker/Dockerfile-netclient-full

@@ -24,7 +24,7 @@ RUN git clone https://git.zx2c4.com/wireguard-tools && \
     make && \
     make && \
     make install
     make install
 
 
-FROM alpine:3.13.6
+FROM alpine:3.15.2
 
 
 WORKDIR /root/
 WORKDIR /root/
 
 

+ 1 - 1
docker/Dockerfile-netclient-kernel

@@ -3,7 +3,7 @@ FROM debian:buster as builder
 
 
 RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
 RUN apt update -y && apt install -y wget bash gcc musl-dev openssl golang git build-essential libmnl-dev iptables
 
 
-RUN wget -O go.tgz https://dl.google.com/go/go1.17.1.linux-amd64.tar.gz
+RUN wget -O go.tgz https://go.dev/dl/go1.18.linux-amd64.tar.gz
 
 
 RUN tar -C /usr/local -xzf go.tgz
 RUN tar -C /usr/local -xzf go.tgz
 
 

+ 1 - 1
docker/Dockerfile-netclient-multiarch

@@ -9,7 +9,7 @@ ENV GO111MODULE=auto
 
 
 RUN GOOS=linux CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s -X 'main.version=${TAG}'" -o netclient-app netclient/main.go
 RUN GOOS=linux CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s -X 'main.version=${TAG}'" -o netclient-app netclient/main.go
 
 
-FROM alpine:3.13.6
+FROM alpine:3.15.2
 
 
 WORKDIR /root/
 WORKDIR /root/
 
 

+ 1 - 1
docker/Dockerfile-netmaker-slim

@@ -9,7 +9,7 @@ ENV GO111MODULE=auto
 
 
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 /usr/local/go/bin/go build -ldflags="-w -s" -o netmaker main.go
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 /usr/local/go/bin/go build -ldflags="-w -s" -o netmaker main.go
 
 
-FROM alpine:3.13.6
+FROM alpine:3.15.2
 # add a c lib
 # add a c lib
 RUN apk add gcompat iptables wireguard-tools
 RUN apk add gcompat iptables wireguard-tools
 # set the working directory
 # set the working directory