Compare commits

..

13 Commits

Author SHA1 Message Date
dae9bdc684 Dockerfile_PHP84 aktualisiert 2025-01-04 18:35:50 +00:00
909f7b3c48 Dockerfile_PHP83 aktualisiert 2025-01-04 18:35:36 +00:00
c432947592 compose.yml aktualisiert
All checks were successful
release-tag / release-image (push) Successful in 1m50s
2025-01-04 17:48:10 +00:00
97ddb1855e Dockerfile_Redis aktualisiert
Some checks failed
release-tag / release-image (push) Has been cancelled
2025-01-04 17:47:51 +00:00
5b53aa9eeb redis/redis.conf aktualisiert
All checks were successful
release-tag / release-image (push) Successful in 1m41s
2025-01-04 17:38:38 +00:00
bbfa49ca9e redis/redis.conf aktualisiert
All checks were successful
release-tag / release-image (push) Successful in 1m35s
2025-01-04 17:01:18 +00:00
61b79ad469 redis/redis.conf aktualisiert
All checks were successful
release-tag / release-image (push) Successful in 1m38s
2025-01-04 16:50:18 +00:00
f310ac0541 Dockerfile_PHP83 aktualisiert
All checks were successful
release-tag / release-image (push) Successful in 1m39s
2025-01-04 16:36:12 +00:00
3c38b07657 Dockerfile_PHP84 aktualisiert
Some checks failed
release-tag / release-image (push) Has been cancelled
2025-01-04 16:34:12 +00:00
0c38b692b4 Dockerfile_PHP84 aktualisiert
All checks were successful
release-tag / release-image (push) Successful in 2m31s
2025-01-04 16:22:53 +00:00
a7073058e0 Merge pull request 'staging' (#3) from staging into main
All checks were successful
release-tag / release-image (push) Successful in 2m33s
Reviewed-on: #3
2025-01-04 14:55:14 +00:00
4dfc299ca1 compose.yml aktualisiert 2025-01-04 14:54:52 +00:00
8c488d342b .gitea/workflows/registry.yml hinzugefügt 2025-01-04 14:53:23 +00:00
6 changed files with 101 additions and 136 deletions

View File

@@ -0,0 +1,87 @@
name: release-tag
on:
push:
branches:
- 'main'
jobs:
release-image:
runs-on: ubuntu-latest
env:
DOCKER_ORG: sendnrw
DOCKER_LATEST: latest
RUNNER_TOOL_CACHE: /toolcache
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker BuildX
uses: docker/setup-buildx-action@v2
with: # replace it with your local IP
config-inline: |
[registry."git.send.nrw"]
http = true
insecure = true
- name: Login to DockerHub
uses: docker/login-action@v2
with:
registry: git.send.nrw # replace it with your local IP
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Get Meta
id: meta
run: |
echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
- name: Build and push PHP83
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile_PHP83
platforms: |
linux/amd64
push: true
tags: | # replace it with your local IP and tags
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php83:${{ steps.meta.outputs.REPO_VERSION }}
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php83:${{ env.DOCKER_LATEST }}
- name: Build and push PHP84
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile_PHP84
platforms: |
linux/amd64
push: true
tags: | # replace it with your local IP and tags
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php84:${{ steps.meta.outputs.REPO_VERSION }}
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_php84:${{ env.DOCKER_LATEST }}
- name: Build and push Web
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile_WEB
platforms: |
linux/amd64
push: true
tags: | # replace it with your local IP and tags
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_web:${{ steps.meta.outputs.REPO_VERSION }}
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_web:${{ env.DOCKER_LATEST }}
- name: Build and push Redis
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile_Redis
platforms: |
linux/amd64
push: true
tags: | # replace it with your local IP and tags
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_redis:${{ steps.meta.outputs.REPO_VERSION }}
git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}_redis:${{ env.DOCKER_LATEST }}

View File

@@ -1,65 +1,7 @@
FROM alpine:latest
RUN apk update && apk upgrade
RUN apk add bash
RUN apk add autoconf
RUN apk add automake
RUN apk add make
RUN apk add gcc
RUN apk add g++
RUN apk add php83
RUN apk add php83-fpm
RUN apk add php83-opcache
RUN apk add php83-gd
RUN apk add php83-zlib
RUN apk add php83-curl
RUN apk add php83-bz2
RUN apk add php83-bcmath
RUN apk add php83-exif
RUN apk add php83-fileinfo
RUN apk add php83-iconv
RUN apk add php83-imap
RUN apk add php83-intl
RUN apk add php83-ldap
RUN apk add php83-mbstring
RUN apk add php83-mysqli
RUN apk add php83-odbc
RUN apk add php83-pdo
RUN apk add php83-pdo_mysql
RUN apk add php83-pdo_odbc
RUN apk add php83-pdo_pgsql
RUN apk add php83-pdo_sqlite
RUN apk add php83-pdo_dblib
RUN apk add php83-pear
RUN apk add php83-pecl-imagick
RUN apk add php83-pecl-memcache
RUN apk add php83-pecl-memcached
RUN apk add php83-pecl-mongodb
RUN apk add php83-pecl-redis
RUN apk add php83-pecl-smbclient
RUN apk add php83-pecl-ssh2
RUN apk add php83-pecl-xdebug
RUN apk add php83-pecl-yaml
RUN apk add php83-pgsql
RUN apk add php83-phar
RUN apk add php83-phpdbg
RUN apk add php83-session
RUN apk add php83-simplexml
RUN apk add php83-snmp
RUN apk add php83-soap
RUN apk add php83-sockets
RUN apk add php83-sodium
RUN apk add php83-sqlite3
RUN apk add php83-sysvmsg
RUN apk add php83-tidy
RUN apk add php83-xml
RUN apk add php83-xmlreader
RUN apk add php83-xmlwriter
RUN apk add php83-xsl
RUN apk add php83-zip
RUN apk add php83-ctype
RUN apk add php83-tokenizer
RUN apk update && apk upgrade && apk add bash autoconf automake make gcc g++ php83 php83-fpm php83-opcache php83-gd php83-zlib php83-curl php83-bz2 php83-bcmath php83-exif php83-fileinfo php83-iconv php83-imap php83-intl php83-ldap php83-mbstring php83-mysqli php83-odbc php83-pdo php83-pdo_mysql php83-pdo_odbc php83-pdo_pgsql php83-pdo_sqlite php83-pdo_dblib php83-pear php83-pecl-imagick php83-pecl-memcache php83-pecl-memcached php83-pecl-mongodb php83-pecl-redis php83-pecl-smbclient php83-pecl-ssh2 php83-pecl-xdebug php83-pecl-yaml php83-pgsql php83-phar php83-phpdbg php83-session php83-simplexml php83-snmp php83-soap php83-sockets php83-sodium php83-sqlite3 php83-sysvmsg php83-tidy php83-xml php83-xmlreader php83-xmlwriter php83-xsl php83-zip php83-ctype php83-tokenizer
COPY php83 /etc/php83
RUN mkdir /var/run/php
EXPOSE 9000
STOPSIGNAL SIGTERM
CMD ["/bin/bash", "-c", "chmod 755 /usr/share/nginx/html && php-fpm83"]
CMD ["/bin/bash", "-c", "php-fpm83 -F"]

View File

@@ -1,65 +1,7 @@
FROM alpine:latest
RUN apk update && apk upgrade
RUN apk add bash
RUN apk add autoconf
RUN apk add automake
RUN apk add make
RUN apk add gcc
RUN apk add g++
RUN apk add php84
RUN apk add php84-fpm
RUN apk add php84-opcache
RUN apk add php84-gd
RUN apk add php84-zlib
RUN apk add php84-curl
RUN apk add php84-bz2
RUN apk add php84-bcmath
RUN apk add php84-exif
RUN apk add php84-fileinfo
RUN apk add php84-iconv
RUN apk add php84-imap
RUN apk add php84-intl
RUN apk add php84-ldap
RUN apk add php84-mbstring
RUN apk add php84-mysqli
RUN apk add php84-odbc
RUN apk add php84-pdo
RUN apk add php84-pdo_mysql
RUN apk add php84-pdo_odbc
RUN apk add php84-pdo_pgsql
RUN apk add php84-pdo_sqlite
RUN apk add php84-pdo_dblib
RUN apk add php84-pear
RUN apk add php84-pecl-imagick
RUN apk add php84-pecl-memcache
RUN apk add php84-pecl-memcached
RUN apk add php84-pecl-mongodb
RUN apk add php84-pecl-redis
RUN apk add php84-pecl-smbclient
RUN apk add php84-pecl-ssh2
RUN apk add php84-pecl-xdebug
RUN apk add php84-pecl-yaml
RUN apk add php84-pgsql
RUN apk add php84-phar
RUN apk add php84-phpdbg
RUN apk add php84-session
RUN apk add php84-simplexml
RUN apk add php84-snmp
RUN apk add php84-soap
RUN apk add php84-sockets
RUN apk add php84-sodium
RUN apk add php84-sqlite3
RUN apk add php84-sysvmsg
RUN apk add php84-tidy
RUN apk add php84-xml
RUN apk add php84-xmlreader
RUN apk add php84-xmlwriter
RUN apk add php84-xsl
RUN apk add php84-zip
RUN apk add php84-ctype
RUN apk add php84-tokenizer
RUN apk update && apk upgrade && apk add bash autoconf automake make gcc g++ php84 php84-fpm php84-opcache php84-gd php84-zlib php84-curl php84-bz2 php84-bcmath php84-exif php84-fileinfo php84-iconv php84-imap php84-intl php84-ldap php84-mbstring php84-mysqli php84-odbc php84-pdo php84-pdo_mysql php84-pdo_odbc php84-pdo_pgsql php84-pdo_sqlite php84-pdo_dblib php84-pear php84-pecl-imagick php84-pecl-memcache php84-pecl-memcached php84-pecl-mongodb php84-pecl-redis php84-pecl-smbclient php84-pecl-ssh2 php84-pecl-xdebug php84-pecl-yaml php84-pgsql php84-phar php84-phpdbg php84-session php84-simplexml php84-snmp php84-soap php84-sockets php84-sodium php84-sqlite3 php84-sysvmsg php84-tidy php84-xml php84-xmlreader php84-xmlwriter php84-xsl php84-zip php84-ctype php84-tokenizer
COPY php84 /etc/php84
RUN mkdir /var/run/php
EXPOSE 9000
STOPSIGNAL SIGTERM
CMD ["/bin/bash", "-c", "chmod 755 /usr/share/nginx/html && php-fpm84"]
CMD ["/bin/bash", "-c", "php-fpm84 -F"]

View File

@@ -1,13 +1,7 @@
FROM alpine:latest
RUN apk update && apk upgrade
RUN apk add bash
RUN apk add autoconf
RUN apk add automake
RUN apk add make
RUN apk add gcc
RUN apk add g++
RUN apk add redis
COPY redis/redis.conf /etc/redis.conf
RUN apk update && apk upgrade && apk add bash autoconf automake make gcc g++ redis
RUN mkdir /config
COPY redis/redis.conf /config/redis.conf
EXPOSE 6379
STOPSIGNAL SIGTERM
CMD ["/bin/bash", "-c", "redis-server /etc/redis.conf"]
CMD ["/bin/bash", "-c", "redis-server /config/redis.conf"]

View File

@@ -7,7 +7,7 @@ networks:
- subnet: 172.17.0.0/24
services:
web:
image: git.send.nrw/sendnrw/sid_web_nginx:latest
image: git.send.nrw/sendnrw/security_in_depth_web_web:latest
volumes:
- /docker/mnt/stack0/web1/server/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
- /docker/mnt/stack0/web1/server/etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
@@ -33,7 +33,7 @@ services:
ports:
- "8080:80"
php83:
image: git.send.nrw/sendnrw/sid_web_php83:latest
image: git.send.nrw/sendnrw/security_in_depth_web_php83:latest
volumes:
- /docker/mnt/stack0/web1/server/etc/php83/php-fpm.conf:/etc/php83/php-fpm.conf
- /docker/mnt/stack0/web1/server/etc/php83/php.ini:/etc/php83/php.ini
@@ -53,7 +53,7 @@ services:
web_network_1:
ipv4_address: 172.17.0.83
php84:
image: git.send.nrw/sendnrw/sid_web_php84:latest
image: git.send.nrw/sendnrw/security_in_depth_web_php84:latest
volumes:
- /docker/mnt/stack0/web1/server/etc/php84/php-fpm.conf:/etc/php84/php-fpm.conf
- /docker/mnt/stack0/web1/server/etc/php84/php.ini:/etc/php84/php.ini
@@ -73,9 +73,9 @@ services:
web_network_1:
ipv4_address: 172.17.0.84
redis:
image: git.send.nrw/sendnrw/sid_web_redis:latest
image: git.send.nrw/sendnrw/security_in_depth_web_redis:latest
volumes:
- /docker/mnt/stack0/web1/server/etc/redis/redis.conf:/etc/redis.conf
- /docker/mnt/stack0/web1/server/etc/redis/redis.conf:/config/redis.conf
deploy:
replicas: 1
update_config:

View File

@@ -34,7 +34,7 @@
# By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
daemonize yes
daemonize no
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here.