Compare commits
3 Commits
master
..
53e54e1900
| Author | SHA1 | Date | |
|---|---|---|---|
|
53e54e1900
|
|||
|
301236af94
|
|||
|
899cef5dcd
|
@@ -37,7 +37,6 @@ jobs:
|
||||
build-args: |
|
||||
LIBRESSL_VERSION=4.2.1
|
||||
NGINX_VERSION=1.30.0
|
||||
NJS_VERSION=0.9.8
|
||||
NGINX_BRANCH=vanilla
|
||||
-
|
||||
name: Build and push nginx custom images
|
||||
@@ -60,5 +59,4 @@ jobs:
|
||||
build-args: |
|
||||
LIBRESSL_VERSION=4.2.1
|
||||
NGINX_VERSION=1.30.0
|
||||
NJS_VERSION=0.9.8
|
||||
NGINX_BRANCH=woggioni
|
||||
|
||||
@@ -29,5 +29,6 @@ jobs:
|
||||
pull: false
|
||||
ssh: default=/home/luser/.ssh/id_ed25519
|
||||
tags: |
|
||||
"gitea.woggioni.net/woggioni/sserver-rust:dev"
|
||||
"gitea.woggioni.net/woggioni/sserver-rust:latest"
|
||||
"gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
|
||||
build-args: "VERSION=1.24.0"
|
||||
|
||||
@@ -16,7 +16,6 @@ RUN rm repository.key
|
||||
RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
|
||||
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
|
||||
curl \
|
||||
openssh \
|
||||
aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
|
||||
arm-unknown-linux-musleabihf-gcc \
|
||||
arm-unknown-linux-musleabi-gcc \
|
||||
@@ -71,6 +70,7 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
|
||||
imagemagick \
|
||||
python-sphinx \
|
||||
python-yaml \
|
||||
openssh \
|
||||
rust \
|
||||
rust-src \
|
||||
rust-bindgen \
|
||||
|
||||
+4
-3
@@ -2,7 +2,7 @@ ARG NGINX_BRANCH=vanilla
|
||||
FROM alpine:3.23 AS base
|
||||
|
||||
FROM base AS build_stage_1
|
||||
ARG NGINX_VERSION LIBRESSL_VERSION NJS_VERSION
|
||||
ARG NGINX_VERSION LIBRESSL_VERSION
|
||||
RUN --mount=type=cache,target=/var/cache/apk apk update
|
||||
RUN --mount=type=cache,target=/var/cache/apk apk add \
|
||||
autoconf \
|
||||
@@ -34,7 +34,8 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
|
||||
tar \
|
||||
tzdata \
|
||||
zlib \
|
||||
zlib-dev
|
||||
zlib-dev \
|
||||
mercurial
|
||||
RUN adduser -D luser
|
||||
USER luser
|
||||
WORKDIR /home/luser
|
||||
@@ -68,7 +69,7 @@ ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
|
||||
|
||||
USER root
|
||||
WORKDIR /
|
||||
ADD --chown=luser:luser git@github.com:nginx/njs.git#${NJS_VERSION} /njs
|
||||
RUN hg clone http://hg.nginx.org/njs /njs
|
||||
RUN chown luser:luser -R /njs
|
||||
USER luser
|
||||
WORKDIR /home/luser
|
||||
|
||||
Reference in New Issue
Block a user