chore: Docker Build fixes (#1502)

Pass correct context to docker build for multiarch and dev build targets.

* fixed missing file errors; bumped boundary version
* downgraded alpine due to build issues
* fixing makefile
* bumping boundary and alpine versions
* fixed docker directory in makefile and dockerfile
* updating dev.dockerfile & makefile
This commit is contained in:
Jacob Mammoliti authored and GitHub committed 2021-09-21 09:46:17 -04:00
1 parent 1c40100edd
commit 2f329c4e93
3 files changed
+8 -7

No files matched your search

+4 -3
View File
@@ -200,13 +200,14 @@ docker-multiarch-build:
--tag hashicorp/boundary:latest \
--build-arg VERSION=$(VERSION) \
--platform linux/amd64,linux/arm64 \
--file $(DOCKER_DIR)/Release.dockerfile .
--file $(DOCKER_DIR)/Release.dockerfile docker/
# builds from locally generated binary in bin/
docker-build-dev: export XC_OSARCH=linux/amd64
docker-build-dev: dev
cp -r bin docker/
docker build -t $(IMAGE_TAG_DEV) \
-f $(DOCKER_DIR)/Dev.dockerfile .
-f $(DOCKER_DIR)/Dev.dockerfile docker/
# requires appropriate permissions in dockerhub
docker-publish:
+1 -1
View File
@@ -6,7 +6,7 @@ RUN addgroup boundary && \
ADD bin/boundary /bin/boundary
RUN mkdir /boundary/
ADD docker/config.hcl /boundary/config.hcl
ADD ./config.hcl /boundary/config.hcl
RUN chown -R boundary:boundary /boundary/
EXPOSE 9200 9201 9202
+3 -3
View File
@@ -1,4 +1,4 @@
FROM docker.mirror.hashicorp.services/alpine:3.13
FROM docker.mirror.hashicorp.services/alpine:3.13.6
ARG VERSION=0.6.1
@@ -40,6 +40,6 @@ RUN chown -R boundary:boundary /boundary/
EXPOSE 9200 9201 9202
VOLUME /boundary/
COPY ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["server", "-config", "/boundary/config.hcl"]
CMD ["server", "-config", "/boundary/config.hcl"]