diff options
| -rw-r--r-- | Dockerfile.dev | 6 | ||||
| -rw-r--r-- | Dockerfile.updater.dev | 6 | ||||
| -rw-r--r-- | docker-compose.override.yml | 17 |
3 files changed, 22 insertions, 7 deletions
diff --git a/Dockerfile.dev b/Dockerfile.dev new file mode 100644 index 0000000..1d8dad7 --- /dev/null +++ b/Dockerfile.dev @@ -0,0 +1,6 @@ +FROM golang:1.14.0 +RUN apt update && apt install -y ca-certificates ntp ntpdate +WORKDIR /go/src/soko +COPY . /go/src/soko + +CMD tail -f /dev/null diff --git a/Dockerfile.updater.dev b/Dockerfile.updater.dev new file mode 100644 index 0000000..c6327a3 --- /dev/null +++ b/Dockerfile.updater.dev @@ -0,0 +1,6 @@ +FROM golang:1.14.0 +RUN apt update && apt install -y ca-certificates ntp ntpdate git +WORKDIR /go/src/soko +COPY . /go/src/soko + +CMD tail -f /dev/null diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 20a0357..6179a5b 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -2,11 +2,16 @@ version: '3.2' services: http-serving: - build: . + build: + context: . + dockerfile: Dockerfile.dev volumes: - type: "bind" source: "/var/log/soko" target: "/var/log/soko" + - type: "bind" + source: "." + target: "/go/src/soko" environment: SOKO_LOG_FILE: '/var/log/soko/web.log' # SOKO_DEBUG: 'true' @@ -14,11 +19,10 @@ services: - 127.0.0.1:5000:5000 depends_on: - db - image: http-serving updater: build: context: . - dockerfile: Dockerfile.updater + dockerfile: Dockerfile.updater.dev volumes: - type: "bind" source: "/mnt/packages-tree" @@ -26,9 +30,9 @@ services: - type: "bind" source: "/var/cache/pgo-egencache" target: "/var/cache/pgo-egencache" -# - type: "bind" -# source: "." -# target: "/go/src/soko" + - type: "bind" + source: "." + target: "/go/src/soko" - type: "bind" source: "/var/log/soko" target: "/var/log/soko" @@ -37,7 +41,6 @@ services: # SOKO_DEBUG: 'true' depends_on: - db - image: updater db: image: postgres:12 restart: always |