WIP: Prebuilt docker image #803

Draft
floatingghost wants to merge 37 commits from customizable-docker-db into develop
2 changed files with 3 additions and 7 deletions
Showing only changes of commit 5fc47d4b80 - Show all commits

View file

@ -24,7 +24,7 @@ steps:
secrets: [docker_username, docker_password] secrets: [docker_username, docker_password]
settings: settings:
repo: woodpeckerci/woodpecker-agent repo: woodpeckerci/woodpecker-agent
dockerfile: docker/Dockerfile.agent.multiarch dockerfile: Dockerfile
platforms: linux/amd64 platforms: linux/amd64
tag: next tag: next
when: when:

View file

@ -1,12 +1,11 @@
version: "3.7"
services: services:
db: db:
image: akkoma-db:latest image: akkoma-db:latest
build: ./docker-resources/database build: ./docker-resources/database
shm_size: 4gb shm_size: 4gb
restart: unless-stopped restart: unless-stopped
user: ${DOCKER_USER} env_file:
- .env
environment: { environment: {
# This might seem insecure but is usually not a problem. # This might seem insecure but is usually not a problem.
# You should leave this at the "akkoma" default. # You should leave this at the "akkoma" default.
@ -18,8 +17,6 @@ services:
POSTGRES_USER: akkoma, POSTGRES_USER: akkoma,
POSTGRES_PASSWORD: akkoma, POSTGRES_PASSWORD: akkoma,
} }
env_file:
- .env
volumes: volumes:
- type: bind - type: bind
source: ./pgdata source: ./pgdata
@ -27,7 +24,6 @@ services:
akkoma: akkoma:
image: akkoma:latest image: akkoma:latest
build: .
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- .env - .env