Skip to content

Commit

Permalink
Merge pull request #11 from nhsconnect/PRMP-925
Browse files Browse the repository at this point in the history
[PRMP-925] Let's import Docker instead of building it
  • Loading branch information
chrisbloe-nhse authored Sep 25, 2024
2 parents 8c45f4a + 865563e commit a398b0b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions gocd/mhs.gocd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ pipelines:
destination: prm-repo-mhs
mhs:
git: https://github.com/NHSDigital/integration-adaptor-mhs.git
branch: release/1.3.1
branch: release/1.3.2
destination: integration-adaptor-mhs
stages:
- build_docker:
# - build_docker:
- import_docker:
clean_workspace: true
jobs:
outbound:
Expand All @@ -28,7 +29,8 @@ pipelines:
command: /bin/bash
arguments:
- -c
- ./tasks build_docker outbound
# - ./tasks build_docker outbound
- ./tasks import_docker outbound
inbound:
resources:
- docker
Expand All @@ -42,4 +44,5 @@ pipelines:
command: /bin/bash
arguments:
- -c
- ./tasks build_docker inbound
# - ./tasks build_docker inbound
- ./tasks import_docker inbound
2 changes: 1 addition & 1 deletion tasks
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ case "${command}" in
echo "Please specify one of the images to be built: inbound or outbound"
exit 5
fi
UPSTREAM_TAG=1.3.1
UPSTREAM_TAG=1.3.2
REPO_GIT_HASH=$(git rev-parse HEAD | cut -c 1-8)
BUILD_TAG="${UPSTREAM_TAG}-${REPO_GIT_HASH}"
fetch_redaction_utils
Expand Down

0 comments on commit a398b0b

Please sign in to comment.