Compare commits

..

No commits in common. "32b0418832ba8134b18050ca5e235d97eb25cd34" and "96689f9c307a6f1e5780dea23fcea5be0f2be703" have entirely different histories.

2 changed files with 14 additions and 16 deletions

View file

@ -2,8 +2,7 @@
# FROM gitea/gitea:1.17.3 # FROM gitea/gitea:1.17.3
# FROM codeberg.org/forgejo/forgejo:1.18.0-rc1-1 # FROM codeberg.org/forgejo/forgejo:1.18.0-rc1-1
# FROM codeberg.org/forgejo/forgejo:1.18.0-rc1-2 # FROM codeberg.org/forgejo/forgejo:1.18.0-rc1-2
# FROM codeberg.org/forgejo/forgejo:1.18.0-1 FROM codeberg.org/forgejo/forgejo:1.18.0-1
FROM codeberg.org/forgejo/forgejo:1.18.3-0
COPY entrypoint-wrapper parse-database-url /usr/bin/ COPY entrypoint-wrapper parse-database-url /usr/bin/
RUN chmod 755 /usr/bin/entrypoint-wrapper /usr/bin/parse-database-url RUN chmod 755 /usr/bin/entrypoint-wrapper /usr/bin/parse-database-url

View file

@ -4,16 +4,15 @@ version: '3.4'
services: services:
web: web:
build: . image: gitea/gitea:1.16.9
image: glenux/service-forgejo
environment: environment:
USER_UID: 1000 USER_UID: 1000
USER_GID: 1000 USER_GID: 1000
GITEA__database__DB_TYPE: mysql GITEA__database__DB_TYPE: mysql
GITEA__database__HOST: db:3306 GITEA__database__HOST: db:3306
GITEA__database__NAME: forgejo GITEA__database__NAME: gitea
GITEA__database__USER: forgejo GITEA__database__USER: gitea
GITEA__database__PASSWD: forgejo GITEA__database__PASSWD: gitea
# GITEA__mailer__ENABLED: true # GITEA__mailer__ENABLED: true
# GITEA__mailer__FROM: "${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}" # GITEA__mailer__FROM: "${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}"
# GITEA__mailer__MAILER_TYPE: smtp # GITEA__mailer__MAILER_TYPE: smtp
@ -22,8 +21,8 @@ services:
# GITEA__mailer__USER: "${GITEA__mailer__USER:-apikey}" # GITEA__mailer__USER: "${GITEA__mailer__USER:-apikey}"
# GITEA__mailer__PASSWD: "${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}" # GITEA__mailer__PASSWD: "${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"
## Generete the value with ## Generete the value with
## docker run -it --rm forgejo/forgejo:1 forgejo generate secret SECRET_KEY ## docker run -it --rm gitea/gitea:1 gitea generate secret SECRET_KEY
## docker run -it --rm forgejo/forgejo:1 forgejo generate secret INTERNAL_TOKEN ## docker run -it --rm gitea/gitea:1 gitea generate secret INTERNAL_TOKEN
# GITEA__security__SECRET_KEY=[value returned by generate secret SECRET_KEY] # GITEA__security__SECRET_KEY=[value returned by generate secret SECRET_KEY]
# GITEA__security__INTERNAL_TOKEN=[value returned by generate secret INTERNAL_TOKEN] # GITEA__security__INTERNAL_TOKEN=[value returned by generate secret INTERNAL_TOKEN]
@ -37,23 +36,23 @@ services:
depends_on: depends_on:
- db - db
networks: networks:
- forgejo_net - gitea_net
db: db:
image: mysql:8 image: mysql:8
restart: always restart: always
environment: environment:
MYSQL_ROOT_PASSWORD: forgejo MYSQL_ROOT_PASSWORD: gitea
MYSQL_USER: forgejo MYSQL_USER: gitea
MYSQL_PASSWORD: forgejo MYSQL_PASSWORD: gitea
MYSQL_DATABASE: forgejo MYSQL_DATABASE: gitea
volumes: volumes:
- db_data:/var/lib/mysql - db_data:/var/lib/mysql
networks: networks:
- forgejo_net - gitea_net
networks: networks:
forgejo_net: gitea_net:
volumes: volumes:
app_data: app_data: