diff --git a/Taskfile.yml b/Taskfile.yml index d118a19..f18c3ea 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,7 +4,9 @@ includes: tf: { taskfile: terraform, dir: terraform } tasks: - dev: docker compose -f compose.dev.yml up --build --force-recreate --no-deps + dev: + - docker compose -f compose.dev.yml rm -fsv + - docker compose -f compose.dev.yml up --build --force-recreate --no-deps deploy:fast: ansible-playbook playbooks/fast.yml deploy:slow: ansible-playbook playbooks/slow.yml diff --git a/compose.dev.yml b/compose.dev.yml index 5852bf1..19661db 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -3,8 +3,10 @@ services: # Gitea itself. gitea: container_name: web-git-instance + restart: unless-stopped depends_on: - backup + - bucket-script build: context: gitea dockerfile: Dockerfile.dev @@ -31,7 +33,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro environment: AWS_ENDPOINT: localstack:4566 - AWS_S3_BUCKET_NAME: test + AWS_S3_BUCKET_NAME: backup AWS_ACCESS_KEY_ID: _ AWS_SECRET_ACCESS_KEY: _ BACKUP_CRON_EXPRESSION: "* * * * *" @@ -59,7 +61,11 @@ services: AWS_ACCESS_KEY_ID: _ AWS_SECRET_ACCESS_KEY: _ AWS_ENDPOINT_URL: http://localstack:4566 - command: '"aws s3api create-bucket --bucket test"' + command: | + " + aws s3api create-bucket --bucket backup + aws s3api create-bucket --bucket storage + " volumes: data: diff --git a/gitea/Dockerfile.dev b/gitea/Dockerfile.dev index 1a43e50..7f6b027 100644 --- a/gitea/Dockerfile.dev +++ b/gitea/Dockerfile.dev @@ -3,6 +3,8 @@ FROM gitea/gitea:latest-rootless ADD --chown=git:git config /etc/gitea ADD --chown=git:git custom /etc/gitea-custom +ENV GITEA_CUSTOM=/etc/gitea-custom + RUN rm /etc/gitea/app.ini RUN mv /etc/gitea/dev.app.ini /etc/gitea/app.ini diff --git a/gitea/config/dev.app.ini b/gitea/config/dev.app.ini index 194b865..f17a670 100644 --- a/gitea/config/dev.app.ini +++ b/gitea/config/dev.app.ini @@ -32,8 +32,8 @@ PROTOCOL = https ROOT_URL = https://localhost:443/ DOMAIN = localhost HTTP_PORT = 443 -CERT_FILE = cert.pem -KEY_FILE = key.pem +CERT_FILE = /etc/gitea-custom/cert.pem +KEY_FILE = /etc/gitea-custom/key.pem [database] DB_TYPE = sqlite3 @@ -95,3 +95,12 @@ DEFAULT_TRUST_MODEL = committer [oauth2] JWT_SECRET = x-----------------------------------------x + +[storage] +STORAGE_TYPE = minio +MINIO_ENDPOINT = localstack:4566 +MINIO_ACCESS_KEY_ID = test +MINIO_SECRET_ACCESS_KEY = test +MINIO_BUCKET = storage +MINIO_USE_SSL = false +MINIO_INSECURE_SKIP_VERIFY = true \ No newline at end of file