Skip to content
Snippets Groups Projects
Commit 54cb13ba authored by Marc Burnie [AWS]'s avatar Marc Burnie [AWS]
Browse files

aws: fix build time

parent 4a7046f0
Branches
Tags
1 merge request!340aws: fix build time
......@@ -5,19 +5,17 @@ RUN npm update -g
# install Koop CLI
RUN npm install -g @koopjs/cli
ADD gcz-provider/gcz-provider-core/ignite-provider/package.json /gcz-provider-core/ignite-provider/package.json
ADD gcz-provider/gcz-provider-core/package.json /gcz-provider-core/package.json
WORKDIR /gcz-provider-core
RUN npm install
WORKDIR /
COPY gcz-provider/gcz-provider-core /gcz-provider-core
COPY gcz-provider/provider/gcz-provider-aws/build-aws/entrypoint.sh /entrypoint.sh
# Remove the default/bundled configuration file, it will be replaced at deployment time by a ConfigMap mounted volume
RUN rm -rf /gcz-provider-core/config
WORKDIR /gcz-provider-core
RUN npm install
WORKDIR /gcz-provider-core/ignite-provider
RUN npm install
WORKDIR /
EXPOSE 8083
ENTRYPOINT ["/bin/sh", "-c", ". /entrypoint.sh"]
\ No newline at end of file
......@@ -81,7 +81,7 @@ phases:
- echo "Build and push docker image..."
- docker buildx create --driver docker-container --use
- docker buildx inspect --bootstrap
- docker buildx build --platform linux/arm64/v8,linux/amd64 --pull --push -f gcz-provider/provider/gcz-provider-aws/build-aws/Dockerfile -t ${ECR_IMAGE_PROD} -t ${ECR_IMAGE_BRANCH_LATEST} .
- docker buildx build --platform linux/arm64/v8,linux/amd64 --pull --push -f gcz-provider/provider/gcz-provider-aws/build-aws/Dockerfile -t ${ECR_IMAGE_PROD} -t ${ECR_IMAGE_BRANCH_LATEST} --cache-to type=registry,ref=${ECR_REGISTRY}:cache,mode=max,image-manifest=true,oci-mediatypes=true --cache-from type=registry,ref=${ECR_REGISTRY}:cache .
- echo "Generate build-info.json"
- |
......
......@@ -5,10 +5,6 @@ ARG CONFIG_DIR=provider/gcz-transformer-apache/config
ARG BUILD_AWS_DIR=provider/gcz-transformer-aws/build-aws
ARG PYTHON_VERSION=3.11.6
COPY ${JAR_FILE} /app.jar
COPY ${CONFIG_DIR}/application.yml /
COPY ${BUILD_AWS_DIR}/entrypoint.sh /entrypoint.sh
# Python3 is required to support advanced datatype ingestion like Well Log & Well Marker
RUN apk update && \
apk add --no-cache --virtual .build-deps \
......@@ -51,6 +47,11 @@ RUN wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[
python3 -m pip install setuptools==70.0.0 --upgrade --trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org; \
cd ~
COPY ${JAR_FILE} /app.jar
COPY ${CONFIG_DIR}/application.yml /
COPY ${BUILD_AWS_DIR}/entrypoint.sh /entrypoint.sh
RUN /usr/sbin/groupadd -g 10001 -r appgroup && \
/usr/sbin/useradd -M -g 10001 -r -u 10001 appuser
......
......@@ -79,7 +79,7 @@ phases:
- echo "Build and push docker image..."
- docker buildx create --driver docker-container --use
- docker buildx inspect --bootstrap
- docker buildx build --platform linux/arm64/v8,linux/amd64 --pull --push -f provider/gcz-transformer-aws/build-aws/Dockerfile -t ${ECR_IMAGE} -t ${ECR_IMAGE_BRANCH_LATEST} .
- docker buildx build --platform linux/arm64/v8,linux/amd64 --pull --push -f provider/gcz-transformer-aws/build-aws/Dockerfile -t ${ECR_IMAGE} -t ${ECR_IMAGE_BRANCH_LATEST} --cache-to type=registry,ref=${ECR_REGISTRY}:cache,mode=max,image-manifest=true,oci-mediatypes=true --cache-from type=registry,ref=${ECR_REGISTRY}:cache .
- echo "Generate build-info.json"
- |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment