Merge branch 'nightly' into release/nightly/bin/ncproxy/0.12.0

next-hat · Jun 6, 2024 · 8e86fce · 8e86fce
2 parents 56f3361 + 4a634b6
commit 8e86fce
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 69 deletions.
diff --git a/.github/workflows/draft_nightly_nanocl.yml b/.github/workflows/draft_nightly_nanocl.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   release_image:
     runs-on: ubuntu-latest
-    container: rust:1.78.0-alpine3.19
+    container: rust:1.78.0-alpine3.20
 
     steps:
       # Install required dependencies

diff --git a/.github/workflows/draft_stable_nanocl.yml b/.github/workflows/draft_stable_nanocl.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   release_image:
     runs-on: ubuntu-latest
-    container: rust:1.78.0-alpine3.19
+    container: rust:1.78.0-alpine3.20
 
     steps:
       # Install required dependencies

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,6 +5,9 @@
     "editor.defaultFormatter": "sissel.shopify-liquid",
     "editor.formatOnSave": false
   },
+  "[docker]": {
+    "editor.defaultFormatter": "ms-azuretools.vscode-docker"
+  },
   "editor.detectIndentation": false,
   "editor.trimAutoWhitespace": true,
   "editor.formatOnSave": true,

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/nanocl/Dockerfile b/bin/nanocl/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 - generate recipe file for dependencies
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as planner
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as planner
 
 WORKDIR /app
 COPY ./Cargo.toml ./Cargo.toml
@@ -15,14 +15,14 @@ COPY ./bin/ncvpnkit/Cargo.toml ./bin/ncvpnkit/Cargo.toml
 COPY ./bin/ncdns/Cargo.toml ./bin/ncdns/Cargo.toml
 
 # stage 2 - Build our project
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as builder
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as builder
 
 ARG channel=stable
 ## Build our nanocl daemon binary
 COPY --from=planner /app /app
 WORKDIR /app
-RUN export ARCH=$(uname -m) \
-  && rustup target add $ARCH-unknown-linux-musl
+RUN export ARCH=$(uname -m) && \
+  rustup target add $ARCH-unknown-linux-musl
 RUN apk add --no-cache --upgrade \
   build-base \
   musl-dev \
@@ -53,10 +53,10 @@ COPY ./bin/ncdns/src ./bin/ncdns/src
 COPY .git ./.git
 ENV NANOCL_CHANNEL=$channel
 ENV RUSTFLAGS="-C target-feature=+crt-static"
-RUN export ARCH=$(uname -m) \
-  && cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin nanocl
-RUN export ARCH=$(uname -m) \
-  && cp /app/target/$ARCH-unknown-linux-musl/release/nanocl /bin/nanocl
+RUN export ARCH=$(uname -m) && \
+  cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin nanocl
+RUN export ARCH=$(uname -m) && \
+  cp /app/target/$ARCH-unknown-linux-musl/release/nanocl /bin/nanocl
 
 # stage 4 - create runtime image
 FROM --platform=$BUILDPLATFORM scratch

diff --git a/bin/nanocld/Dockerfile b/bin/nanocld/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 - generate recipe file for dependencies
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as planner
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as planner
 
 WORKDIR /app
 COPY ./Cargo.toml ./Cargo.toml
@@ -15,14 +15,14 @@ COPY ./bin/ncvpnkit/Cargo.toml ./bin/ncvpnkit/Cargo.toml
 COPY ./bin/ncdns/Cargo.toml ./bin/ncdns/Cargo.toml
 
 # stage 2 - Build our project
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as builder
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as builder
 
 ARG channel=stable
 ## Build our nanocl daemon binary
 COPY --from=planner /app /app
 WORKDIR /app
-RUN export ARCH=$(uname -m) \
-  && rustup target add $ARCH-unknown-linux-musl
+RUN export ARCH=$(uname -m) && \
+  rustup target add $ARCH-unknown-linux-musl
 RUN apk add --update alpine-sdk musl-dev g++ make libpq-dev openssl-dev git perl build-base
 COPY ./bin/nanocld/migrations ./bin/nanocld/migrations
 COPY ./crates/nanocl_error/src ./crates/nanocl_error/src
@@ -48,7 +48,7 @@ RUN cargo build --release --features release --bin nanocld
 RUN cp /app/target/release/nanocld /bin/nanocld
 
 # stage 3 - Create runtime image
-FROM --platform=$BUILDPLATFORM alpine:3.19.0
+FROM --platform=$BUILDPLATFORM alpine:3.20.0
 
 ## Install dependencies
 RUN apk --update add libgcc \
@@ -58,11 +58,11 @@ RUN apk --update add libgcc \
   bash \
   curl \
   cloud-utils \
-  cdrkit \
-  && rm -rf /var/cache/apk/* \
-  && rm -rf /tmp/* \
-  && rm -rf /var/log/* \
-  && rm -rf /var/tmp/*
+  cdrkit && \
+  rm -rf /var/cache/apk/* && \
+  rm -rf /tmp/* && \
+  rm -rf /var/log/* && \
+  rm -rf /var/tmp/*
 
 ## Copy the binary
 COPY --from=builder /bin/nanocld /bin/nanocld

diff --git a/bin/ncdns/Dockerfile b/bin/ncdns/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 - generate recipe file for dependencies
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as planner
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as planner
 
 WORKDIR /app
 COPY ./Cargo.toml ./Cargo.toml
@@ -15,14 +15,14 @@ COPY ./bin/ncvpnkit/Cargo.toml ./bin/ncvpnkit/Cargo.toml
 COPY ./bin/ncdns/Cargo.toml ./bin/ncdns/Cargo.toml
 
 # stage 2 - Build our project
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as builder
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as builder
 
 ARG channel=stable
 ## Build our nanocl daemon binary
 COPY --from=planner /app /app
 WORKDIR /app
-RUN export ARCH=$(uname -m) \
-  && rustup target add $ARCH-unknown-linux-musl
+RUN export ARCH=$(uname -m) && \
+  rustup target add $ARCH-unknown-linux-musl
 RUN apk add --update alpine-sdk musl-dev g++ make libpq-dev openssl-dev git perl build-base
 COPY ./bin/nanocld/migrations ./bin/nanocld/migrations
 COPY ./crates/nanocl_stubs/src ./crates/nanocl_stubs/src
@@ -44,10 +44,10 @@ COPY ./bin/ncdns/src ./bin/ncdns/src
 COPY .git ./.git
 ENV NANOCL_CHANNEL=$channel
 ENV RUSTFLAGS="-C target-feature=+crt-static"
-RUN export ARCH=$(uname -m) \
-  && cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncdns
-RUN export ARCH=$(uname -m) \
-  && cp /app/target/$ARCH-unknown-linux-musl/release/ncdns /bin/ncdns
+RUN export ARCH=$(uname -m) && \
+  cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncdns
+RUN export ARCH=$(uname -m) && \
+  cp /app/target/$ARCH-unknown-linux-musl/release/ncdns /bin/ncdns
 
 # stage 4 - create runtime image
 FROM --platform=$BUILDPLATFORM scratch

diff --git a/bin/ncproxy/Dockerfile b/bin/ncproxy/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 - generate recipe file for dependencies
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as planner
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as planner
 
 WORKDIR /app
 COPY ./Cargo.toml ./Cargo.toml
@@ -15,14 +15,14 @@ COPY ./bin/ncvpnkit/Cargo.toml ./bin/ncvpnkit/Cargo.toml
 COPY ./bin/ncdns/Cargo.toml ./bin/ncdns/Cargo.toml
 
 # stage 2 - Build our project
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as builder
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as builder
 
 ARG channel=stable
 ## Build our nanocl daemon binary
 COPY --from=planner /app /app
 WORKDIR /app
-RUN export ARCH=$(uname -m) \
-  && rustup target add $ARCH-unknown-linux-musl
+RUN export ARCH=$(uname -m) && \
+  rustup target add $ARCH-unknown-linux-musl
 RUN apk add --update alpine-sdk musl-dev g++ make libpq-dev openssl-dev git perl build-base
 COPY ./bin/nanocld/migrations ./bin/nanocld/migrations
 COPY ./crates/nanocl_error/src ./crates/nanocl_error/src
@@ -44,10 +44,10 @@ COPY ./bin/ncdns/src ./bin/ncdns/src
 COPY .git ./.git
 ENV NANOCL_CHANNEL=$channel
 ENV RUSTFLAGS="-C target-feature=+crt-static"
-RUN export ARCH=$(uname -m) \
-  && cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncproxy
-RUN export ARCH=$(uname -m) \
-  && cp /app/target/$ARCH-unknown-linux-musl/release/ncproxy /bin/ncproxy
+RUN export ARCH=$(uname -m) && \
+  cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncproxy
+RUN export ARCH=$(uname -m) && \
+  cp /app/target/$ARCH-unknown-linux-musl/release/ncproxy /bin/ncproxy
 
 # stage 4 - create runtime image
 FROM --platform=$BUILDPLATFORM scratch

diff --git a/bin/ncvpnkit/Dockerfile b/bin/ncvpnkit/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1 - generate recipe file for dependencies
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as planner
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as planner
 
 WORKDIR /app
 COPY ./Cargo.toml ./Cargo.toml
@@ -15,14 +15,14 @@ COPY ./bin/ncvpnkit/Cargo.toml ./bin/ncvpnkit/Cargo.toml
 COPY ./bin/ncdns/Cargo.toml ./bin/ncdns/Cargo.toml
 
 # stage 2 - Build our project
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19 as builder
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20 as builder
 
 ARG channel=stable
 ## Build our nanocl daemon binary
 COPY --from=planner /app /app
 WORKDIR /app
-RUN export ARCH=$(uname -m) \
-  && rustup target add $ARCH-unknown-linux-musl
+RUN export ARCH=$(uname -m) && \
+  rustup target add $ARCH-unknown-linux-musl
 RUN apk add --update alpine-sdk musl-dev g++ make libpq-dev openssl-dev git perl build-base
 COPY ./bin/nanocld/migrations ./bin/nanocld/migrations
 COPY ./crates/nanocl_error/src ./crates/nanocl_error/src
@@ -44,10 +44,10 @@ COPY ./bin/ncdns/src ./bin/ncdns/src
 COPY .git ./.git
 ENV NANOCL_CHANNEL=$channel
 ENV RUSTFLAGS="-C target-feature=+crt-static"
-RUN export ARCH=$(uname -m) \
-  && cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncvpnkit
-RUN export ARCH=$(uname -m) \
-  && cp /app/target/$ARCH-unknown-linux-musl/release/ncvpnkit /bin/ncvpnkit
+RUN export ARCH=$(uname -m) && \
+  cargo build --release --target=$ARCH-unknown-linux-musl --features vendored --features release --bin ncvpnkit
+RUN export ARCH=$(uname -m) && \
+  cp /app/target/$ARCH-unknown-linux-musl/release/ncvpnkit /bin/ncvpnkit
 
 # stage 4 - create runtime image
 FROM --platform=$BUILDPLATFORM scratch

diff --git a/bin/ndns/Cargo.toml b/bin/ndns/Cargo.toml
@@ -1,3 +1,3 @@
 [package]
 name = "ndns"
-version = "2.90.0-n0.6"
+version = "2.90.0-n0.7"
diff --git a/bin/ndns/Dockerfile b/bin/ndns/Dockerfile
@@ -1,10 +1,10 @@
-FROM alpine:3.19.1
+FROM alpine:3.20.0
 
-RUN apk --update add dnsmasq \
-  && rm -rf /var/cache/apk/* \
-  && rm -rf /tmp/* \
-  && rm -rf /var/log/* \
-  && rm -rf /var/tmp/*
+RUN apk --update add dnsmasq && \
+  rm -rf /var/cache/apk/* && \
+  rm -rf /tmp/* && \
+  rm -rf /var/log/* && \
+  rm -rf /var/tmp/*
 
 EXPOSE 53/udp
 

diff --git a/bin/nproxy/Cargo.toml b/bin/nproxy/Cargo.toml
@@ -1,3 +1,3 @@
 [package]
 name = "nproxy"
-version = "1.25.4-n0.11"
+version = "1.26.0-n0.12"
diff --git a/bin/nproxy/Dockerfile b/bin/nproxy/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:23.10
+FROM ubuntu:24.10
 
 USER root
 
 RUN apt-get update && \
-  apt-get install -y nginx nginx-common nginx-extras \
-  && rm -rf /var/lib/apt/lists/* \
-  && rm -rf /tmp/* \
-  && rm -rf /var/log/* \
-  && rm -rf /var/tmp/*
+  apt-get install -y nginx nginx-common nginx-extras && \
+  rm -rf /var/lib/apt/lists/* && \
+  rm -rf /tmp/* && \
+  rm -rf /var/log/* && \
+  rm -rf /var/tmp/*
 
 EXPOSE 80/tcp 443/tcp
 

diff --git a/doc/man/nanocl-state-apply.md b/doc/man/nanocl-state-apply.md
@@ -5,8 +5,8 @@ apply - Create or Update elements from a Statefile
 # SYNOPSIS
 
 **apply** \[**-s**\|**\--state-location**\] \[**-f**\|**\--follow**\]
-\[**-y**\|**\--yes**\] \[**-r**\|**\--reload**\] \[**-h**\|**\--help**\]
-\[*ARGS*\]
+\[**-y**\|**\--yes**\] \[**-r**\|**\--reload**\]
+\[**\--remove-orphans**\] \[**-h**\|**\--help**\] \[*ARGS*\]
 
 # DESCRIPTION
 
@@ -30,6 +30,10 @@ Create or Update elements from a Statefile
 
 :   Perform an apply even if state didnt changed
 
+**\--remove-orphans**
+
+:   Remove orphaned elements
+
 **-h**, **\--help**
 
 :   Print help

diff --git a/installer.yml b/installer.yml
@@ -57,7 +57,7 @@ Cargoes:
 - Name: nproxy
   Container:
     # {% if channel == "nightly" %}
-    Image: ghcr.io/next-hat/nproxy:1.25.4-n0.11-nightly
+    Image: ghcr.io/next-hat/nproxy:1.26.0-n0.12-nightly
     # {% else %}
     Image: ghcr.io/next-hat/nproxy:1.25.4-n0.11
     # {% endif %}
@@ -99,7 +99,7 @@ Cargoes:
 - Name: ndns
   Container:
     # {% if channel == "nightly" %}
-    Image: ghcr.io/next-hat/ndns:2.90.0-n0.6-nightly
+    Image: ghcr.io/next-hat/ndns:2.90.0-n0.7-nightly
     # {% else %}
     Image: ghcr.io/next-hat/ndns:2.90.0-n0.6
     # {% endif %}

diff --git a/scripts/dev.Dockerfile b/scripts/dev.Dockerfile
@@ -1,5 +1,5 @@
 # Create Builder image
-FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.19
+FROM --platform=$BUILDPLATFORM rust:1.78.0-alpine3.20
 
 RUN apk add --update \
   gcc \

diff --git a/scripts/release_nanocl.sh b/scripts/release_nanocl.sh
@@ -31,14 +31,13 @@ cargo build --release --target=${target_arch} --features vendored --features rel
 # Generate man pages
 for file in ./bin/nanocl/target/man/*; do
   file_name=$(basename "${file}")
-  gzip < "$file" > "${release_path}"/usr/share/man/man1/"$file_name".gz
-  pandoc --from man --to markdown < "$file" > ./doc/man/"${file_name%.1}".md
+  gzip <"$file" >"${release_path}"/usr/share/man/man1/"$file_name".gz
 done
 
 # Copy binary
 cp ./target/${target_arch}/release/${pkg_name} "${release_path}"/usr/bin
 # Generate DEBIAN controll
-cat > ${release_path}/DEBIAN/control <<- EOM
+cat >${release_path}/DEBIAN/control <<-EOM
 Package: ${pkg_name}
 Version: ${version}
 Architecture: ${pkg_arch}