diff --git a/.env.dev b/.env.dev index 72a9eeb..d3a9c25 100644 --- a/.env.dev +++ b/.env.dev @@ -1,4 +1,6 @@ POSIX_PORT= PROXY_PORT= ACCESS_KEY_ID= -SECRET_ACCESS_KEY= \ No newline at end of file +SECRET_ACCESS_KEY= +IAM_DIR= +SETUP_DIR= \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2cf439a..c14a6e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,12 @@ RUN go build -o versitygw FROM alpine:latest -RUN mkdir /tmp/vgw +# These arguments can be overriden when building the image +ARG IAM_DIR=/tmp/vgw +ARG SETUP_DIR=/tmp/vgw + +RUN mkdir -p $IAM_DIR +RUN mkdir -p $SETUP_DIR COPY --from=0 /app/cmd/versitygw/versitygw /app/versitygw diff --git a/Dockerfile.dev b/Dockerfile.dev index f335d20..087ef57 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -7,7 +7,11 @@ RUN go mod download COPY ./ ./ -RUN mkdir /tmp/vgw +ARG IAM_DIR=/tmp/vgw +ARG SETUP_DIR=/tmp/vgw + +RUN mkdir -p $IAM_DIR +RUN mkdir -p $SETUP_DIR RUN go get github.com/githubnemo/CompileDaemon RUN go install github.com/githubnemo/CompileDaemon \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 481771c..7a4edd3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,11 +4,14 @@ services: build: context: . dockerfile: ./Dockerfile.dev + args: + - IAM_DIR=${IAM_DIR} + - SETUP_DIR=${SETUP_DIR} volumes: - ./:/app ports: - "${POSIX_PORT}:${POSIX_PORT}" - command: ["sh", "-c", CompileDaemon -build="go build -C ./cmd/versitygw -o versitygw" -command="./cmd/versitygw/versitygw -p :$POSIX_PORT -a $ACCESS_KEY_ID -s $SECRET_ACCESS_KEY --iam-dir /tmp/vgw posix /tmp/vgw"] + command: ["sh", "-c", CompileDaemon -build="go build -C ./cmd/versitygw -o versitygw" -command="./cmd/versitygw/versitygw -p :$POSIX_PORT -a $ACCESS_KEY_ID -s $SECRET_ACCESS_KEY --iam-dir $IAM_DIR posix $SETUP_DIR"] proxy: build: context: .