mirror of
https://github.com/d9pouces/id_configurator.git
synced 2026-11-09 01:47:21 +01:00
feat: update Dockerfiles and configuration for TLS support across multiple modules
Signed-off-by: d9pouces <github@19pouces.net>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
FROM alpine:3.20 AS detection
|
||||
FROM interdiode/id_configurator:latest AS configuration
|
||||
FROM interdiode/id-configurator:latest AS configuration
|
||||
COPY --from=detection / /src/
|
||||
COPY --from=generated-config Apk.yaml /config.yaml
|
||||
RUN id-configurator apply --config /config.yaml --src /src --dst /dst
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
FROM debian:trixie-slim AS detection
|
||||
FROM interdiode/id_configurator:latest AS configuration
|
||||
FROM interdiode/id-configurator:latest AS configuration
|
||||
COPY --from=detection / /src/
|
||||
COPY --from=generated-config Apt.yaml /config.yaml
|
||||
RUN id-configurator apply --config /config.yaml --src /src --dst /dst
|
||||
FROM debian:trixie-slim AS runtime
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
|
||||
COPY --from=configuration /dst/ /
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends idconfiguratortestpkg \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
FROM maven:3.9-eclipse-temurin-21 AS detection
|
||||
FROM interdiode/id_configurator:latest AS configuration
|
||||
FROM interdiode/id-configurator:latest AS configuration
|
||||
COPY --from=detection / /src/
|
||||
COPY --from=generated-config Java.yaml /config.yaml
|
||||
RUN id-configurator apply --config /config.yaml --src /src --dst /dst
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
FROM python:3.13-slim AS detection
|
||||
FROM interdiode/id_configurator:latest AS configuration
|
||||
FROM interdiode/id-configurator:latest AS configuration
|
||||
COPY --from=detection / /src/
|
||||
COPY --from=generated-config Python.yaml /config.yaml
|
||||
RUN id-configurator apply --config /config.yaml --src /src --dst /dst
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
FROM rockylinux:9 AS detection
|
||||
FROM interdiode/id_configurator:latest AS configuration
|
||||
FROM interdiode/id-configurator:latest AS configuration
|
||||
COPY --from=detection / /src/
|
||||
COPY --from=generated-config Yum.yaml /config.yaml
|
||||
RUN id-configurator apply --config /config.yaml --src /src --dst /dst
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# Minimal Alpine (apk) repository with a signed index, serving one hand-built
|
||||
# .apk package over plain HTTP, used by tox-docker to exercise the `apk`
|
||||
# module integration test (tests/configs/Apk.yaml.tmpl,
|
||||
# .apk package over TLS, using the same Test CA as the pypi-repo/apt-repo/
|
||||
# yum-repo fixtures, used by tox-docker to exercise the `apk` module
|
||||
# integration test (tests/configs/Apk.yaml.j2,
|
||||
# tests/dockerfiles/Apk.Dockerfile). The package is signed with the static
|
||||
# key pair 040d0af5f97a0a44.rsa / 040d0af5f97a0a44.rsa.pub, whose public
|
||||
# half is what the `apk` module configuration is expected to install into
|
||||
@@ -39,5 +40,7 @@ RUN arch_dir=$(ls /home/builder/packages/builder) \
|
||||
|
||||
FROM nginx:alpine
|
||||
COPY --from=packagebuild /srv /srv
|
||||
COPY repo-server.crt.pem /etc/nginx/certs/repo-server.crt.pem
|
||||
COPY repo-server.key.pem /etc/nginx/certs/repo-server.key.pem
|
||||
COPY apk-repo.nginx.conf /etc/nginx/conf.d/default.conf
|
||||
EXPOSE 8443
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
server {
|
||||
listen 8443 default_server;
|
||||
listen 8443 ssl default_server;
|
||||
server_name _;
|
||||
|
||||
ssl_certificate /etc/nginx/certs/repo-server.crt.pem;
|
||||
ssl_certificate_key /etc/nginx/certs/repo-server.key.pem;
|
||||
|
||||
root /srv;
|
||||
autoindex off;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# Minimal Maven-compatible repository serving one hand-built jar over plain
|
||||
# HTTP, used by tox-docker to exercise the `java` module integration test
|
||||
# (tests/configs/Java.yaml.tmpl, tests/dockerfiles/Java.Dockerfile).
|
||||
# Minimal Maven-compatible repository serving one hand-built jar over TLS,
|
||||
# using the same Test CA as the pypi-repo/apt-repo/yum-repo/apk-repo
|
||||
# fixtures, used by tox-docker to exercise the `java` module integration
|
||||
# test (tests/configs/Java.yaml.j2, tests/dockerfiles/Java.Dockerfile).
|
||||
#
|
||||
# Built by tox-docker, whose build context is this directory (not the repo
|
||||
# root) - every COPY source below must live under tests/dockerfiles/repos/.
|
||||
@@ -10,5 +11,7 @@ RUN python3 /build_test_jar.py
|
||||
|
||||
FROM nginx:alpine
|
||||
COPY --from=jarbuild /srv /srv
|
||||
COPY repo-server.crt.pem /etc/nginx/certs/repo-server.crt.pem
|
||||
COPY repo-server.key.pem /etc/nginx/certs/repo-server.key.pem
|
||||
COPY java-repo.nginx.conf /etc/nginx/conf.d/default.conf
|
||||
EXPOSE 8443
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
server {
|
||||
listen 8443 default_server;
|
||||
listen 8443 ssl default_server;
|
||||
server_name _;
|
||||
|
||||
ssl_certificate /etc/nginx/certs/repo-server.crt.pem;
|
||||
ssl_certificate_key /etc/nginx/certs/repo-server.key.pem;
|
||||
|
||||
root /srv;
|
||||
autoindex off;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Minimal YUM/DNF repository serving one hand-built RPM package over plain
|
||||
# HTTP (gpgcheck is off in the test config, so no TLS/signing is needed),
|
||||
# used by tox-docker to exercise the `yum` module integration test
|
||||
# (tests/configs/Yum.yaml.tmpl, tests/dockerfiles/Yum.Dockerfile).
|
||||
# Minimal YUM/DNF repository serving one hand-built RPM package over TLS,
|
||||
# using the same Test CA as the pypi-repo/apt-repo fixtures, used by
|
||||
# tox-docker to exercise the `yum` module integration test
|
||||
# (tests/configs/Yum.yaml.j2, tests/dockerfiles/Yum.Dockerfile).
|
||||
#
|
||||
# Built by tox-docker, whose build context is this directory (not the repo
|
||||
# root) - every COPY source below must live under tests/dockerfiles/repos/.
|
||||
@@ -16,5 +16,7 @@ RUN createrepo_c /srv
|
||||
|
||||
FROM nginx:alpine
|
||||
COPY --from=packagebuild /srv /srv
|
||||
COPY repo-server.crt.pem /etc/nginx/certs/repo-server.crt.pem
|
||||
COPY repo-server.key.pem /etc/nginx/certs/repo-server.key.pem
|
||||
COPY yum-repo.nginx.conf /etc/nginx/conf.d/default.conf
|
||||
EXPOSE 8443
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
server {
|
||||
listen 8443 default_server;
|
||||
listen 8443 ssl default_server;
|
||||
server_name _;
|
||||
|
||||
ssl_certificate /etc/nginx/certs/repo-server.crt.pem;
|
||||
ssl_certificate_key /etc/nginx/certs/repo-server.key.pem;
|
||||
|
||||
root /srv;
|
||||
autoindex off;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user