Skip to content

Commit 9d1211e

Browse files
AWS registry (#3)
* add aws part * make field optional * fix typo * fix typo
1 parent bf40230 commit 9d1211e

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

DeployToQA.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,9 @@ echo "Deploy to ${APP_NAME}-qa.satel.ca"
1111
export DOCKER_TLS_VERIFY='1'
1212
export DOCKER_HOST='tcp://34.234.172.171:2376'
1313
export DOCKER_CERT_PATH='/home/satel/.docker/machine/machines/satel-webapps-qa'
14-
docker login --username=$DOCKER_USER --password=$DOCKER_PASS $REGISTRY
15-
docker stack deploy --with-registry-auth -c docker-compose.qa.yml ${APP_NAME}
14+
15+
if [[ ! $REGISTRY_TYPE ]]; then
16+
docker login --username=$DOCKER_USER --password=$DOCKER_PASS $REGISTRY
17+
fi
18+
19+
docker stack deploy --with-registry-auth -c docker-compose.qa.yml ${APP_NAME}

action.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ inputs:
66
required: true
77
satel-docker-user:
88
description: Username for satel docker registry
9-
required: true
9+
required: false
1010
satel-docker-pass:
1111
description: Password for satel docker registry
12-
required: true
12+
required: false
1313
satel-registry:
1414
description: Satel registry address
15-
required: true
15+
required: false
1616
clean-branch-name:
1717
description: Clean branch name
1818
required: true
1919
work-dir:
20-
description: work directory
20+
description: Work directory
21+
required: false
22+
registry-type:
23+
description: Type of registry
2124
required: false
2225

2326
runs:
@@ -31,5 +34,6 @@ runs:
3134
REGISTRY: ${{ inputs.satel-registry }}
3235
CLEAN_BRANCH_NAME: ${{ inputs.clean-branch-name }}
3336
WORK_DIR: ${{ inputs.work-dir }}
37+
REGISTRY_TYPE: ${{ inputs.registry-type }}
3438
run: ${{ github.action_path }}/DeployToQA.sh
3539
shell: bash

0 commit comments

Comments
 (0)