Skip to content

Fix Docker build #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IsaacJT wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Docker build #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
544cdf2
Fixed building and running with Docker
IsaacJT Feb 4, 2022
11bbbc1
Added version tag to the postgres container in docker-compose.yml
IsaacJT Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM ubuntu:xenial

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y postgresql-client golang-go ca-certificates
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y postgresql-client golang-1.13-go ca-certificates git

ENV GOPATH=/go
ADD . /go/src/github.com/CanonicalLtd/serial-vault

WORKDIR /go/src/github.com/CanonicalLtd/serial-vault
# get dependencies
RUN go get ./...
RUN /usr/lib/go-1.13/bin/go get ./...

COPY ./docker-compose/settings.yaml /go/src/github.com/CanonicalLtd/serial-vault
COPY ./docker-compose/docker-entrypoint.sh /
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
db:
image: postgres
image: postgres:9
env_file:
- ./env
web:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ sed -i \
-e "s/KEYSTORE_SECRET/$KEYSTORE_SECRET/g" \
settings.yaml

go run cmd/serial-vault/main.go -mode=admin &
go run cmd/serial-vault/main.go -mode=signing
/usr/lib/go-1.13/bin/go run cmd/serial-vault/main.go -mode=admin &
/usr/lib/go-1.13/bin/go run cmd/serial-vault/main.go -mode=signing