From fd40b875ee3c85a3edb91b09565e66923bf4b22b Mon Sep 17 00:00:00 2001 From: Klaas Hoekema Date: Tue, 10 Dec 2024 00:20:28 -0500 Subject: [PATCH] Apply small provisioning fixups Pinning the gulp version fixes a build crash, and removing 'version' from the docker-compose files resolves a warning saying that it's obsolete. --- deployment/aws-batch/docker-compose.yml | 1 - deployment/terraform/docker-compose.yml | 1 - docker-compose.test.yml | 1 - docker-compose.yml | 1 - src/angularjs/Dockerfile | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/deployment/aws-batch/docker-compose.yml b/deployment/aws-batch/docker-compose.yml index 940b8e18..dc12151a 100644 --- a/deployment/aws-batch/docker-compose.yml +++ b/deployment/aws-batch/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2' services: update-job-defs: image: update-job-defs diff --git a/deployment/terraform/docker-compose.yml b/deployment/terraform/docker-compose.yml index c96578ab..6857c83f 100644 --- a/deployment/terraform/docker-compose.yml +++ b/deployment/terraform/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2' services: terraform: image: quay.io/azavea/terraform:1.1.9 diff --git a/docker-compose.test.yml b/docker-compose.test.yml index cfeec045..315a2291 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,4 +1,3 @@ -version: '2' services: nginx: image: pfb-nginx:${GIT_COMMIT} diff --git a/docker-compose.yml b/docker-compose.yml index 0cf41a6a..8ba7b038 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2' services: database: image: postgis/postgis:13-3.1 diff --git a/src/angularjs/Dockerfile b/src/angularjs/Dockerfile index 24d50dcc..56a1f3ee 100644 --- a/src/angularjs/Dockerfile +++ b/src/angularjs/Dockerfile @@ -10,7 +10,7 @@ RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources. RUN apt-get update && apt-get install -y rsync \ && rm -rf /var/lib/apt/lists/* -RUN npm install -g bower gulp +RUN npm install -g bower gulp@3.9.0 WORKDIR /opt/pfb/angularjs COPY package.json ${ANGULAR_DIR}/package.json