Skip to content

Commit 8c5dd02

Browse files
Clinton WerthClinton Werth
authored andcommitted
update prod dockerfile and github actions
1 parent d7db0e8 commit 8c5dd02

2 files changed

Lines changed: 16 additions & 11 deletions

File tree

.github/workflows/aws_dev.deploy.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fi
2727
2828
- name: AWS config
29-
uses: aws-actions/configure-aws-credentials@v3
29+
uses: aws-actions/configure-aws-credentials@v4
3030
with:
3131
role-to-assume: ${{ secrets.AWS_DEV_ROLE }}
3232
role-session-name: GithubNGAGeointSession
@@ -39,18 +39,17 @@ jobs:
3939
- name: Build Docker image
4040
env:
4141
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
42-
REPOSITORY: "/mage/server"
42+
REPOSITORY: "/mage"
4343
IMAGE_TAG: ${{ env.IMAGE_TAG }}
4444
run: |
4545
docker build -t $REGISTRY$REPOSITORY:$IMAGE_TAG .
4646
47-
- name: Push Image and ReDeploy ECS Service
47+
- name: Push Image
4848
if: github.ref =='refs/heads/test' || github.ref =='refs/heads/develop'
4949
env:
5050
SERVICE: "mage${{ env.IMAGE_TAG }}"
5151
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
52-
REPOSITORY: "/mage/server"
52+
REPOSITORY: "/mage"
5353
IMAGE_TAG: ${{ env.IMAGE_TAG }}
5454
run: |
5555
docker push $REGISTRY$REPOSITORY:$IMAGE_TAG
56-
aws ecs update-service --cluster magedev --service $SERVICE --force-new-deployment

docker/server/Dockerfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
FROM registry1.dso.mil/ironbank/opensource/nodejs/debian/nodejs:20.11.1
2+
ARG SERVICE_VERSION=6.4.0-beta.1
3+
ARG WEB_VERSION=6.4.0-beta.1
4+
ARG ARC_SERVICE_VERSION=1.0.0-beta.2
5+
ARG ARC_WEB_VERSION=1.0.0-beta.2
6+
ARG SFTP_SERVICE_VERSION=1.0.0-beta.2
7+
ARG SFTP_WEB_VERSION=1.0.0-beta.2
28

39
LABEL author="NGA"
410

@@ -15,12 +21,12 @@ USER mage
1521
ENV MAGE_HOME=/home/mage/instance
1622
WORKDIR ${MAGE_HOME}
1723
RUN ls -l \
18-
&& npm i --omit dev @ngageoint/mage.service@6.4.0-beta.1 \
19-
&& npm i --omit dev @ngageoint/mage.web-app@6.4.0-beta.1 \
20-
&& npm i --omit dev @ngageoint/mage.arcgis.service@1.0.0-beta.2 \
21-
&& npm i --omit dev @ngageoint/mage.arcgis.web-app@1.0.0-beta.2 \
22-
&& npm i --omit dev @ngageoint/mage.sftp.service@1.0.0-beta.2 \
23-
&& npm i --omit dev @ngageoint/mage.sftp.web@1.0.0-beta.2 \
24+
&& npm i --omit dev @ngageoint/mage.service@${SERVICE_VERSION} \
25+
&& npm i --omit dev @ngageoint/mage.web-app@${WEB_VERSION} \
26+
&& if [ "$ARC_SERVICE_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.arcgis.service@$ARC_SERVICE_VERSION; fi\
27+
&& if [ "$ARC_WEB_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.arcgis.web-app@$ARC_WEB_VERSION; fi \
28+
&& if [ "$SFTP_SERVICE_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.sftp.service@$SFTP_SERVICE_VERSION; fi \
29+
&& if [ "$SFTP_WEB_VERSOIN" != "NONE" ]; then npm i --omit dev @ngageoint/mage.sftp.web@$SFTP_WEB_VERSION; fi \
2430
&& ln -s ./node_modules/.bin/mage.service
2531

2632
VOLUME /var/lib/mage

0 commit comments

Comments
 (0)