From 39e453d565cd05715cc813ba846a19e838c677b0 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 29 Oct 2023 14:33:24 +0100 Subject: [PATCH 1/4] update README --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f59b8e5..ea07211 100644 --- a/README.md +++ b/README.md @@ -335,9 +335,10 @@ and complete the registration procedure. After you register an account, you can ## Contributing -Want to contribute? Awesome! The most basic way to show your support is to star the project, or to raise issues. You -can also support this project by [**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max) or by making -a [Paypal donation](https://www.paypal.me/crazyws) to ensure this journey continues indefinitely! +Want to contribute? Awesome! The most basic way to show your support is to star +the project, or to raise issues. You can also support this project by [**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max) +or by making a [PayPal donation](https://www.paypal.me/crazyws) to ensure this +journey continues indefinitely! Thanks again for your support, it is much appreciated! :pray: From f7e2ec4a4eb238980865513202efb521b4690b9c Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 29 Oct 2023 15:54:56 +0100 Subject: [PATCH 2/4] rebrand (anonaddy > addy.io) --- .github/SUPPORT.md | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 4 +- README.md | 50 +++++++------------ docker-bake.hcl | 2 +- examples/compose/.env | 6 +-- examples/compose/{anonaddy.env => addy.env} | 6 +-- examples/compose/compose.yml | 12 ++--- examples/nginx/README.md | 4 +- examples/nginx/{anonaddy.env => addy.env} | 6 +-- examples/nginx/compose.yml | 16 +++--- .../nginx/templates/default.conf.template | 4 +- examples/rspamd/.env | 6 +-- examples/rspamd/{anonaddy.env => addy.env} | 6 +-- examples/rspamd/compose.yml | 10 ++-- examples/traefik/.env | 6 +-- examples/traefik/anonaddy.env | 10 ++-- examples/traefik/compose.yml | 24 ++++----- rootfs/etc/cont-init.d/00-env | 6 +-- rootfs/etc/cont-init.d/13-config-anonaddy.sh | 2 +- rootfs/etc/cont-init.d/14-config-rspamd.sh | 4 +- test/.env | 6 +-- test/{anonaddy.env => addy.env} | 6 +-- test/compose.yml | 30 +++++------ 24 files changed, 109 insertions(+), 121 deletions(-) rename examples/compose/{anonaddy.env => addy.env} (86%) rename examples/nginx/{anonaddy.env => addy.env} (89%) rename examples/rspamd/{anonaddy.env => addy.env} (89%) rename test/{anonaddy.env => addy.env} (88%) diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md index 8c9634c..38318b3 100644 --- a/.github/SUPPORT.md +++ b/.github/SUPPORT.md @@ -25,6 +25,6 @@ You are now ready to [create a new issue](https://github.com/anonaddy/docker/iss ## Closure policy -* Support directly related to anonaddy will not be provided if your problem is not related to the operation of this image. +* Support directly related to addy.io will not be provided if your problem is not related to the operation of this image. * Issues that don't have the information requested above (when applicable) will be closed immediately and the poster directed to the support guidelines. * Issues that go a week without a response from original poster are subject to closure at my discretion. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa579e3..7e73347 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: type=ref,event=pr type=edge labels: | - org.opencontainers.image.title=AnonAddy + org.opencontainers.image.title=addy.io org.opencontainers.image.description=Anonymous Email Forwarding org.opencontainers.image.vendor=CrazyMax - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4145217..c76b55e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,8 +15,8 @@ on: - '**.md' env: - BUILD_TAG: anonaddy:test - CONTAINER_NAME: anonaddy + BUILD_TAG: addy:test + CONTAINER_NAME: addy jobs: test: diff --git a/README.md b/README.md index ea07211..efa1e53 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,7 @@ ## About -Docker image for [AnonAddy](https://anonaddy.com/), an anonymous email -forwarding service. +Docker image for [addy.io](https://addy.io/), an anonymous email forwarding service. > **Note** > @@ -27,7 +26,6 @@ ___ * [Environment variables](#environment-variables) * [General](#general) * [App](#app) - * [AnonAddy](#anonaddy) * [Database](#database) * [Redis](#redis) * [Mail](#mail) @@ -59,8 +57,8 @@ ___ ## Build locally ```console -git clone https://github.com/anonaddy/docker.git docker-anonaddy -cd docker-anonaddy +git clone https://github.com/anonaddy/docker.git docker-addy +cd docker-addy # Build image and output to docker (default) docker buildx bake @@ -89,8 +87,8 @@ Image: anonaddy/anonaddy:latest ### General * `TZ`: The timezone assigned to the container (default `UTC`) -* `PUID`: AnonAddy user id (default `1000`) -* `PGID`: AnonAddy group id (default `1000`) +* `PUID`: user id (default `1000`) +* `PGID`: group id (default `1000`) * `MEMORY_LIMIT`: PHP memory limit (default `256M`) * `UPLOAD_MAX_SIZE`: Upload max size (default `16M`) * `CLEAR_ENV`: Clear environment in FPM workers (default `yes`) @@ -103,18 +101,10 @@ Image: anonaddy/anonaddy:latest ### App -* `APP_NAME`: Name of the application (default `AnonAddy`) +* `APP_NAME`: Name of the application (default `addy.io`) * `APP_KEY`: Application key for encrypter service. You can generate one through `anonaddy key:generate --show` or `echo "base64:$(openssl rand -base64 32)"`. **required** * `APP_DEBUG`: Enables or disables debug mode, used to troubleshoot issues (default `false`) -* `APP_URL`: The URL of your AnonAddy installation - -> **Note** -> -> `APP_KEY_FILE` can be used to fill in the value from a file, especially for -> Docker's secrets feature. - -### AnonAddy - +* `APP_URL`: The URL of your installation * `ANONADDY_RETURN_PATH`: Return-path header for outbound emails * `ANONADDY_ADMIN_USERNAME`: If set this value will be used and allow you to receive forwarded emails at the root domain * `ANONADDY_ENABLE_REGISTRATION`: If set to false this will prevent new users from registering on the site (default `true`) @@ -133,8 +123,9 @@ Image: anonaddy/anonaddy:latest > **Note** > -> `ANONADDY_SECRET_FILE` and `ANONADDY_SIGNING_KEY_FINGERPRINT_FILE` can be used -> to fill in the value from a file, especially for Docker's secrets feature. +> `APP_KEY_FILE`, `ANONADDY_SECRET_FILE` and `ANONADDY_SIGNING_KEY_FINGERPRINT_FILE` +> can be used to fill in the value from a file, especially for Docker's secrets +> feature. ### Database @@ -163,8 +154,8 @@ Image: anonaddy/anonaddy:latest ### Mail -* `MAIL_FROM_NAME`: From name (default `AnonAddy`) -* `MAIL_FROM_ADDRESS`: From email address (default `anonaddy@${ANONADDY_DOMAIN}`) +* `MAIL_FROM_NAME`: From name (default `addy.io`) +* `MAIL_FROM_ADDRESS`: From email address (default `addy@${ANONADDY_DOMAIN}`) * `MAIL_ENCRYPTION`: Encryption protocol to send e-mail messages (default `null`) ### Postfix @@ -224,7 +215,7 @@ Image: anonaddy/anonaddy:latest ## Ports -* `8000`: HTTP port (anonaddy web) +* `8000`: HTTP port (addy.io) * `11334`: HTTP port (rspamd web dashboard) * `25`: SMTP port (postfix) @@ -242,9 +233,6 @@ docker compose logs -f ## Upgrade -You can upgrade AnonAddy automatically through the UI, it works well. But I -recommend to recreate the container whenever I push an update: - ```console docker compose pull docker compose up -d @@ -258,25 +246,25 @@ If you want to use the artisan command to perform common server operations like manage users, passwords and more, type: ```console -docker compose exec anonaddy anonaddy +docker compose exec addy anonaddy ``` For example to list all available commands: ```console -docker compose exec anonaddy anonaddy list +docker compose exec addy anonaddy list ``` ### Create user ```console -docker compose exec anonaddy anonaddy anonaddy:create-user "username" "webmaster@example.com" +docker compose exec addy anonaddy anonaddy:create-user "username" "webmaster@example.com" ``` ### Generate DKIM private/public keypair ```console -docker compose run --entrypoint '' anonaddy gen-dkim +docker compose run --entrypoint '' addy gen-dkim ``` ```text @@ -297,14 +285,14 @@ If you don't have an existing GPG key, you can generate a new GPG key with the following command: ```console -docker compose exec --user anonaddy anonaddy gpg --full-gen-key +docker compose exec --user anonaddy addy gpg --full-gen-key ``` Keys will be stored in `/data/.gnupg` folder. ### Define additional env vars -You can define additional environment variables that will be used by AnonAddy +You can define additional environment variables that will be used by the app by creating a file named `.env` in `/data`. ### Override Postfix main configuration diff --git a/docker-bake.hcl b/docker-bake.hcl index 1a84534..b88253d 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "DEFAULT_TAG" { - default = "anonaddy:local" + default = "addy:local" } // Special target: https://github.com/docker/metadata-action#bake-definition diff --git a/examples/compose/.env b/examples/compose/.env index 8637e7d..2284396 100644 --- a/examples/compose/.env +++ b/examples/compose/.env @@ -1,3 +1,3 @@ -MYSQL_DATABASE=anonaddy -MYSQL_USER=anonaddy -MYSQL_PASSWORD=anonaddy +MYSQL_DATABASE=addy +MYSQL_USER=addy +MYSQL_PASSWORD=addy diff --git a/examples/compose/anonaddy.env b/examples/compose/addy.env similarity index 86% rename from examples/compose/anonaddy.env rename to examples/compose/addy.env index 4da686c..0b686e4 100644 --- a/examples/compose/anonaddy.env +++ b/examples/compose/addy.env @@ -14,7 +14,7 @@ APP_DEBUG=false APP_URL=http://127.0.0.1:8000 ANONADDY_RETURN_PATH=bounces@example.com -ANONADDY_ADMIN_USERNAME=anonaddy +ANONADDY_ADMIN_USERNAME=addy ANONADDY_ENABLE_REGISTRATION=true ANONADDY_DOMAIN=example.com ANONADDY_ALL_DOMAINS=example.com @@ -26,8 +26,8 @@ ANONADDY_BANDWIDTH_LIMIT=104857600 ANONADDY_NEW_ALIAS_LIMIT=10 ANONADDY_ADDITIONAL_USERNAME_LIMIT=3 -MAIL_FROM_NAME=AnonAddy -MAIL_FROM_ADDRESS=anonaddy@example.com +MAIL_FROM_NAME=addy.io +MAIL_FROM_ADDRESS=addy@example.com POSTFIX_DEBUG=false POSTFIX_SMTPD_TLS=false diff --git a/examples/compose/compose.yml b/examples/compose/compose.yml index fb150b6..05c7722 100644 --- a/examples/compose/compose.yml +++ b/examples/compose/compose.yml @@ -1,9 +1,9 @@ -name: annoaddy +name: addy services: db: image: mariadb:10.5 - container_name: anonaddy_db + container_name: addy_db command: - "mysqld" - "--character-set-server=utf8mb4" @@ -19,12 +19,12 @@ services: redis: image: redis:4.0-alpine - container_name: anonaddy_redis + container_name: addy_redis restart: always - anonaddy: + addy: image: anonaddy/anonaddy:latest - container_name: anonaddy + container_name: addy depends_on: - db - redis @@ -38,7 +38,7 @@ services: volumes: - "./data:/data" env_file: - - "./anonaddy.env" + - "./addy.env" environment: - "DB_HOST=db" - "DB_DATABASE=${MYSQL_DATABASE}" diff --git a/examples/nginx/README.md b/examples/nginx/README.md index 93c89d0..0f4dfb9 100644 --- a/examples/nginx/README.md +++ b/examples/nginx/README.md @@ -1,6 +1,6 @@ # Prerequisites -Read [self-hosting docs](https://anonaddy.com/self-hosting/) +Read [self-hosting docs](https://addy.io/self-hosting/) ## Let's Encrypt @@ -22,4 +22,4 @@ let's encrypt and dhparam certs. This nginx configuration supports rspamd web ui out of the box. if you choose to not run rspamd, make sure to remove the `RSPAMD_ENABLE` variable in -`anonaddy.env` and remove the proxy block in `nginx/templates/default.conf.template`. +`addy.env` and remove the proxy block in `nginx/templates/default.conf.template`. diff --git a/examples/nginx/anonaddy.env b/examples/nginx/addy.env similarity index 89% rename from examples/nginx/anonaddy.env rename to examples/nginx/addy.env index cfeb044..64e209d 100644 --- a/examples/nginx/anonaddy.env +++ b/examples/nginx/addy.env @@ -14,7 +14,7 @@ APP_DEBUG=false APP_URL=http://127.0.0.1:8000 ANONADDY_RETURN_PATH=bounces@example.com -ANONADDY_ADMIN_USERNAME=anonaddy +ANONADDY_ADMIN_USERNAME=addy ANONADDY_ENABLE_REGISTRATION=true ANONADDY_DOMAIN=example.com ANONADDY_ALL_DOMAINS=example.com @@ -26,8 +26,8 @@ ANONADDY_BANDWIDTH_LIMIT=104857600 ANONADDY_NEW_ALIAS_LIMIT=10 ANONADDY_ADDITIONAL_USERNAME_LIMIT=3 -MAIL_FROM_NAME=AnonAddy -MAIL_FROM_ADDRESS=anonaddy@example.com +MAIL_FROM_NAME=addy.io +MAIL_FROM_ADDRESS=addy@example.com POSTFIX_DEBUG=false POSTFIX_SMTPD_TLS=false diff --git a/examples/nginx/compose.yml b/examples/nginx/compose.yml index 07afbf9..bd468d1 100644 --- a/examples/nginx/compose.yml +++ b/examples/nginx/compose.yml @@ -1,9 +1,9 @@ -name: annoaddy +name: addy services: db: image: mariadb:10.5 - container_name: anonaddy_db + container_name: addy_db command: - "mysqld" - "--character-set-server=utf8mb4" @@ -19,12 +19,12 @@ services: redis: image: redis:4.0-alpine - container_name: anonaddy_redis + container_name: addy_redis restart: always - anonaddy: + addy: image: anonaddy/anonaddy:latest - container_name: anonaddy + container_name: addy depends_on: - db - redis @@ -35,7 +35,7 @@ services: volumes: - "./data:/data" env_file: - - "./anonaddy.env" + - "./addy.env" environment: - "DB_HOST=db" - "DB_DATABASE=${MYSQL_DATABASE}" @@ -46,7 +46,7 @@ services: nginx: image: nginx:1.20.1-alpine - container_name: anonaddy_nginx + container_name: addy_nginx restart: unless-stopped ports: - '443:443' @@ -55,4 +55,4 @@ services: - ./nginx/templates:/etc/nginx/templates - /etc/letsencrypt:/etc/letsencrypt depends_on: - - anonaddy + - addy diff --git a/examples/nginx/nginx/templates/default.conf.template b/examples/nginx/nginx/templates/default.conf.template index d69f802..3f54ab1 100644 --- a/examples/nginx/nginx/templates/default.conf.template +++ b/examples/nginx/nginx/templates/default.conf.template @@ -44,7 +44,7 @@ server { } location /rspamd { - proxy_pass http://anonaddy:11334; + proxy_pass http://addy:11334; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -52,7 +52,7 @@ server { } location / { - proxy_pass http://anonaddy:8000; + proxy_pass http://addy:8000; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/examples/rspamd/.env b/examples/rspamd/.env index 8637e7d..2284396 100644 --- a/examples/rspamd/.env +++ b/examples/rspamd/.env @@ -1,3 +1,3 @@ -MYSQL_DATABASE=anonaddy -MYSQL_USER=anonaddy -MYSQL_PASSWORD=anonaddy +MYSQL_DATABASE=addy +MYSQL_USER=addy +MYSQL_PASSWORD=addy diff --git a/examples/rspamd/anonaddy.env b/examples/rspamd/addy.env similarity index 89% rename from examples/rspamd/anonaddy.env rename to examples/rspamd/addy.env index cfeb044..64e209d 100644 --- a/examples/rspamd/anonaddy.env +++ b/examples/rspamd/addy.env @@ -14,7 +14,7 @@ APP_DEBUG=false APP_URL=http://127.0.0.1:8000 ANONADDY_RETURN_PATH=bounces@example.com -ANONADDY_ADMIN_USERNAME=anonaddy +ANONADDY_ADMIN_USERNAME=addy ANONADDY_ENABLE_REGISTRATION=true ANONADDY_DOMAIN=example.com ANONADDY_ALL_DOMAINS=example.com @@ -26,8 +26,8 @@ ANONADDY_BANDWIDTH_LIMIT=104857600 ANONADDY_NEW_ALIAS_LIMIT=10 ANONADDY_ADDITIONAL_USERNAME_LIMIT=3 -MAIL_FROM_NAME=AnonAddy -MAIL_FROM_ADDRESS=anonaddy@example.com +MAIL_FROM_NAME=addy.io +MAIL_FROM_ADDRESS=addy@example.com POSTFIX_DEBUG=false POSTFIX_SMTPD_TLS=false diff --git a/examples/rspamd/compose.yml b/examples/rspamd/compose.yml index 460860b..7c2065f 100644 --- a/examples/rspamd/compose.yml +++ b/examples/rspamd/compose.yml @@ -3,7 +3,7 @@ name: annoaddy services: db: image: mariadb:10.5 - container_name: anonaddy_db + container_name: addy_db command: - "mysqld" - "--character-set-server=utf8mb4" @@ -19,12 +19,12 @@ services: redis: image: redis:4.0-alpine - container_name: anonaddy_redis + container_name: addy_redis restart: always - anonaddy: + addy: image: anonaddy/anonaddy:latest - container_name: anonaddy + container_name: addy depends_on: - db - redis @@ -41,7 +41,7 @@ services: volumes: - "./data:/data" env_file: - - "./anonaddy.env" + - "./addy.env" environment: - "DB_HOST=db" - "DB_DATABASE=${MYSQL_DATABASE}" diff --git a/examples/traefik/.env b/examples/traefik/.env index 8637e7d..2284396 100644 --- a/examples/traefik/.env +++ b/examples/traefik/.env @@ -1,3 +1,3 @@ -MYSQL_DATABASE=anonaddy -MYSQL_USER=anonaddy -MYSQL_PASSWORD=anonaddy +MYSQL_DATABASE=addy +MYSQL_USER=addy +MYSQL_PASSWORD=addy diff --git a/examples/traefik/anonaddy.env b/examples/traefik/anonaddy.env index ca38437..6cdcd97 100644 --- a/examples/traefik/anonaddy.env +++ b/examples/traefik/anonaddy.env @@ -11,14 +11,14 @@ LOG_IP_VAR=http_x_forwarded_for APP_KEY= APP_DEBUG=false -APP_URL=https://anonaddy.example.com +APP_URL=https://addy.example.com ANONADDY_RETURN_PATH=bounces@example.com -ANONADDY_ADMIN_USERNAME=anonaddy +ANONADDY_ADMIN_USERNAME=addy ANONADDY_ENABLE_REGISTRATION=true ANONADDY_DOMAIN=example.com ANONADDY_ALL_DOMAINS=example.com -ANONADDY_HOSTNAME=anonaddy.example.com +ANONADDY_HOSTNAME=addy.example.com ANONADDY_DNS_RESOLVER=127.0.0.1 ANONADDY_SECRET= ANONADDY_LIMIT=200 @@ -26,8 +26,8 @@ ANONADDY_BANDWIDTH_LIMIT=104857600 ANONADDY_NEW_ALIAS_LIMIT=10 ANONADDY_ADDITIONAL_USERNAME_LIMIT=3 -MAIL_FROM_NAME=AnonAddy -MAIL_FROM_ADDRESS=anonaddy@example.com +MAIL_FROM_NAME=addy.io +MAIL_FROM_ADDRESS=addy@example.com POSTFIX_DEBUG=false POSTFIX_SMTPD_TLS=false diff --git a/examples/traefik/compose.yml b/examples/traefik/compose.yml index 04929e6..9076750 100644 --- a/examples/traefik/compose.yml +++ b/examples/traefik/compose.yml @@ -1,4 +1,4 @@ -name: annoaddy +name: addy services: traefik: @@ -37,7 +37,7 @@ services: db: image: mariadb:10.5 - container_name: anonaddy_db + container_name: addy_db command: - "mysqld" - "--character-set-server=utf8mb4" @@ -53,12 +53,12 @@ services: redis: image: redis:4.0-alpine - container_name: anonaddy_redis + container_name: addy_redis restart: always - anonaddy: + addy: image: anonaddy/anonaddy:latest - container_name: anonaddy + container_name: addy depends_on: - db - redis @@ -70,14 +70,14 @@ services: - "./data:/data" labels: - "traefik.enable=true" - - "traefik.http.routers.anonaddy.entrypoints=https" - - "traefik.http.routers.anonaddy.rule=Host(`anonaddy.example.com`)" - - "traefik.http.routers.anonaddy.tls=true" - - "traefik.http.routers.anonaddy.tls.certresolver=letsencrypt" - - "traefik.http.routers.anonaddy.tls.domains[0].main=anonaddy.example.com" - - "traefik.http.services.anonaddy.loadbalancer.server.port=8000" + - "traefik.http.routers.addy.entrypoints=https" + - "traefik.http.routers.addy.rule=Host(`addy.example.com`)" + - "traefik.http.routers.addy.tls=true" + - "traefik.http.routers.addy.tls.certresolver=letsencrypt" + - "traefik.http.routers.addy.tls.domains[0].main=addy.example.com" + - "traefik.http.services.addy.loadbalancer.server.port=8000" env_file: - - "./anonaddy.env" + - "./addy.env" environment: - "DB_HOST=db" - "DB_DATABASE=${MYSQL_DATABASE}" diff --git a/rootfs/etc/cont-init.d/00-env b/rootfs/etc/cont-init.d/00-env index b1fbd04..7da2e79 100755 --- a/rootfs/etc/cont-init.d/00-env +++ b/rootfs/etc/cont-init.d/00-env @@ -39,7 +39,7 @@ REAL_IP_HEADER=${REAL_IP_HEADER:-X-Forwarded-For} LOG_IP_VAR=${LOG_IP_VAR:-remote_addr} LOG_CROND=${LOG_CROND:-true} -APP_NAME=${APP_NAME:-AnonAddy} +APP_NAME=${APP_NAME:-addy.io} #APP_KEY=${APP_KEY:-base64:Gh8/RWtNfXTmB09pj6iEflt/L6oqDf9ZxXIh4I9MS7A=} APP_DEBUG=${APP_DEBUG:-false} APP_URL=${APP_URL:-http://localhost} @@ -76,8 +76,8 @@ ANONADDY_ADDITIONAL_USERNAME_LIMIT=${ANONADDY_ADDITIONAL_USERNAME_LIMIT:-10} #ANONADDY_DKIM_SIGNING_KEY=${ANONADDY_DKIM_SIGNING_KEY:-dkim-signing-key} #ANONADDY_DKIM_SELECTOR=${ANONADDY_DKIM_SELECTOR:-default} -MAIL_FROM_NAME=${MAIL_FROM_NAME:-AnonAddy} -MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS:-anonaddy@${ANONADDY_DOMAIN}} +MAIL_FROM_NAME=${MAIL_FROM_NAME:-addy.io} +MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS:-addy@${ANONADDY_DOMAIN}} MAIL_ENCRYPTION=${MAIL_ENCRYPTION:-null} POSTFIX_DEBUG=${POSTFIX_DEBUG:-false} diff --git a/rootfs/etc/cont-init.d/13-config-anonaddy.sh b/rootfs/etc/cont-init.d/13-config-anonaddy.sh index 3a6de18..f776294 100755 --- a/rootfs/etc/cont-init.d/13-config-anonaddy.sh +++ b/rootfs/etc/cont-init.d/13-config-anonaddy.sh @@ -18,7 +18,7 @@ if [ -z "$ANONADDY_SECRET" ]; then exit 1 fi -echo "Creating AnonAddy env file" +echo "Creating env file" cat >/var/www/anonaddy/.env < Date: Sun, 29 Oct 2023 16:01:38 +0100 Subject: [PATCH 3/4] php 8.2 --- Dockerfile | 71 ++++++++++--------- rootfs/etc/cont-init.d/02-fix-perms.sh | 2 +- rootfs/etc/cont-init.d/11-config-php.sh | 10 +-- rootfs/etc/cont-init.d/50-svc-main.sh | 2 +- rootfs/tpls/etc/php81/conf.d/gnupg.ini | 1 - .../etc/{php81 => php82}/conf.d/opcache.ini | 0 .../etc/{php81 => php82}/conf.d/sendmail.ini | 0 .../etc/{php81 => php82}/php-fpm.d/www.conf | 0 8 files changed, 45 insertions(+), 41 deletions(-) delete mode 100644 rootfs/tpls/etc/php81/conf.d/gnupg.ini rename rootfs/tpls/etc/{php81 => php82}/conf.d/opcache.ini (100%) rename rootfs/tpls/etc/{php81 => php82}/conf.d/sendmail.ini (100%) rename rootfs/tpls/etc/{php81 => php82}/php-fpm.d/www.conf (100%) diff --git a/Dockerfile b/Dockerfile index d6311f2..83dcb21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,10 @@ # syntax=docker/dockerfile:1 ARG ANONADDY_VERSION=0.14.1 +ARG ALPINE_VERSION=3.18 FROM crazymax/yasu:latest AS yasu -FROM crazymax/alpine-s6:3.18-2.2.0.3 +FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 COPY --from=yasu / / RUN apk --no-cache add \ @@ -17,35 +18,35 @@ RUN apk --no-cache add \ mysql-client \ nginx \ openssl \ - php81 \ - php81-cli \ - php81-ctype \ - php81-curl \ - php81-dom \ - php81-fileinfo \ - php81-fpm \ - php81-gd \ - php81-gmp \ - php81-iconv \ - php81-intl \ - php81-json \ - php81-opcache \ - php81-openssl \ - php81-pdo \ - php81-pdo_mysql \ - php81-pecl-imagick \ - php81-pecl-mailparse \ - php81-phar \ - php81-redis \ - php81-session \ - php81-simplexml \ - php81-sodium \ - php81-tokenizer \ - php81-xml \ - php81-xmlreader \ - php81-xmlwriter \ - php81-zip \ - php81-zlib \ + php82 \ + php82-cli \ + php82-ctype \ + php82-curl \ + php82-dom \ + php82-fileinfo \ + php82-fpm \ + php82-gd \ + php82-gmp \ + php82-iconv \ + php82-intl \ + php82-json \ + php82-mbstring \ + php82-opcache \ + php82-openssl \ + php82-pdo \ + php82-pdo_mysql \ + php82-pecl-imagick \ + php82-phar \ + php82-redis \ + php82-session \ + php82-simplexml \ + php82-sodium \ + php82-tokenizer \ + php82-xml \ + php82-xmlreader \ + php82-xmlwriter \ + php82-zip \ + php82-zlib \ postfix \ postfix-mysql \ rspamd \ @@ -54,6 +55,7 @@ RUN apk --no-cache add \ shadow \ tar \ tzdata \ + && ln -s /usr/bin/php82 /usr/bin/php \ && cp /etc/postfix/master.cf /etc/postfix/master.cf.orig \ && cp /etc/postfix/main.cf /etc/postfix/main.cf.orig \ && apk --no-cache add -t build-dependencies \ @@ -63,9 +65,12 @@ RUN apk --no-cache add \ gpgme-dev \ libtool \ pcre-dev \ - php81-dev \ - php81-pear \ - && pecl81 install gnupg \ + php82-dev \ + php82-pear \ + && pecl82 install gnupg \ + && echo "extension=gnupg.so" > /etc/php82/conf.d/60_gnupg.ini \ + && pecl82 install mailparse \ + && echo "extension=mailparse.so" > /etc/php82/conf.d/60_mailparse.ini \ && apk del build-dependencies \ && rm -rf /tmp/* /var/www/* diff --git a/rootfs/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh index bc5e9b8..0b46570 100755 --- a/rootfs/etc/cont-init.d/02-fix-perms.sh +++ b/rootfs/etc/cont-init.d/02-fix-perms.sh @@ -14,7 +14,7 @@ chown -R anonaddy. \ /tpls \ /var/lib/nginx \ /var/log/nginx \ - /var/log/php81 \ + /var/log/php82 \ /var/run/nginx \ /var/run/php-fpm \ /var/www/anonaddy/bootstrap/cache \ diff --git a/rootfs/etc/cont-init.d/11-config-php.sh b/rootfs/etc/cont-init.d/11-config-php.sh index 8b26725..99dce91 100755 --- a/rootfs/etc/cont-init.d/11-config-php.sh +++ b/rootfs/etc/cont-init.d/11-config-php.sh @@ -5,18 +5,18 @@ set -e . $(dirname $0)/00-env echo "Init PHP extensions" -cp -Rf /tpls/etc/php81/conf.d /etc/php81 +cp -Rf /tpls/etc/php82/conf.d /etc/php82 echo "Setting PHP-FPM configuration" sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \ -e "s/@UPLOAD_MAX_SIZE@/$UPLOAD_MAX_SIZE/g" \ -e "s/@CLEAR_ENV@/$CLEAR_ENV/g" \ - /tpls/etc/php81/php-fpm.d/www.conf >/etc/php81/php-fpm.d/www.conf + /tpls/etc/php82/php-fpm.d/www.conf >/etc/php82/php-fpm.d/www.conf echo "Setting PHP INI configuration" -sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php81/php.ini -sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php81/php.ini +sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php82/php.ini +sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php82/php.ini echo "Setting OpCache configuration" sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \ - /tpls/etc/php81/conf.d/opcache.ini >/etc/php81/conf.d/opcache.ini + /tpls/etc/php82/conf.d/opcache.ini >/etc/php82/conf.d/opcache.ini diff --git a/rootfs/etc/cont-init.d/50-svc-main.sh b/rootfs/etc/cont-init.d/50-svc-main.sh index 1c69cf9..4419775 100755 --- a/rootfs/etc/cont-init.d/50-svc-main.sh +++ b/rootfs/etc/cont-init.d/50-svc-main.sh @@ -26,6 +26,6 @@ cat > /etc/services.d/php-fpm/run < Date: Sat, 25 Nov 2023 19:40:41 +0100 Subject: [PATCH 4/4] addy.io 1.0.3 --- Dockerfile | 9 +- rootfs/etc/cont-init.d/15-config-postfix.sh | 110 +------------------- 2 files changed, 9 insertions(+), 110 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83dcb21..0574661 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG ANONADDY_VERSION=0.14.1 +ARG ANONADDY_VERSION=1.0.3 ARG ALPINE_VERSION=3.18 FROM crazymax/yasu:latest AS yasu @@ -96,11 +96,10 @@ RUN apk --no-cache add -t build-dependencies \ && git config --global --add safe.directory /var/www/anonaddy \ && git init . && git remote add origin "https://github.com/anonaddy/anonaddy.git" \ && git fetch --depth 1 origin "v${ANONADDY_VERSION}" && git checkout -q FETCH_HEAD \ - && composer install --optimize-autoloader --no-dev --no-interaction --no-ansi \ + && composer install --optimize-autoloader --no-dev --no-interaction --no-ansi --ignore-platform-req=php-64bit \ && chown -R anonaddy. /var/www/anonaddy \ - && npm install --global cross-env \ - && npm ci --ignore-scripts --only=production \ - && npm run production \ + && npm ci --ignore-scripts \ + && APP_URL=https://addy-sh.test npm run production \ && npm prune --production \ && chown -R nobody.nogroup /var/www/anonaddy \ && apk del build-dependencies \ diff --git a/rootfs/etc/cont-init.d/15-config-postfix.sh b/rootfs/etc/cont-init.d/15-config-postfix.sh index 93eecd9..fec67bf 100755 --- a/rootfs/etc/cont-init.d/15-config-postfix.sh +++ b/rootfs/etc/cont-init.d/15-config-postfix.sh @@ -17,6 +17,9 @@ sed -i "s|^smtp.*inet.*|25 inet n - - - - smtpd${POSTFIX_DEBUG_ARG}|g" /etc/post cat >>/etc/postfix/master.cf </etc/postfix/mysql-recipient-access.cf < /etc/postfix/main.cf fi echo "Display Postfix config" postconf | sed -e 's/^/[postfix-config] /' - -echo "Creating check_access stored procedure" -mysql -h ${DB_HOST} -P ${DB_PORT} -u "${DB_USERNAME}" "-p${DB_PASSWORD}" ${DB_DATABASE} <