Skip to content

Commit f3cda2c

Browse files
[PRM-712] updated docker-compose to use localstack 4.14.0, set Java to 25 in pipeline, removed AWS helper scripts
1 parent a63578b commit f3cda2c

File tree

4 files changed

+5
-29
lines changed

4 files changed

+5
-29
lines changed

.github/workflows/full-deployment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
is_deployment: ${{ inputs.is_deployment }}
106106
requires_localstack: true
107107
image_prefix: repo/
108+
java_version: "25"
108109
ecr_alias: repo/re-registration-service
109110
secrets: inherit
110111

services/re-registration-service/docker-compose.localstack-local.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
localstack:
33
container_name: "localstack-re-registration-service"
4-
image: localstack/localstack
4+
image: localstack/localstack:4.14.0
55
ports:
66
- "4566:4566"
77
network_mode: bridge

services/re-registration-service/docker-compose.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
version: "2.2"
21
services:
32
default:
43
links:
54
- localstack:localstack
65
localstack:
7-
image: localstack/localstack
6+
image: localstack/localstack:4.14.0
87
ports:
98
- "4566:4566"
109
environment:

services/re-registration-service/tasks

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,6 @@ set -Eeo pipefail
99
AWS_DEFAULT_REGION=eu-west-2
1010
export NHS_SERVICE=re-registration-service
1111
IMAGE_REPO_NAME=repo/$NHS_SERVICE
12-
AWS_HELPERS_VERSION=0.2.27
13-
echo "AWS helper scripts version: $AWS_HELPERS_VERSION"
14-
15-
###########################
16-
# Shared utils #
17-
###########################
18-
19-
function download_util() {
20-
local UTIL_VERSION=$1
21-
local UTIL_FILENAME=$2
22-
23-
local UTIL_FILEPATH="utils/$UTIL_VERSION/$UTIL_FILENAME"
24-
25-
mkdir -p "utils/$UTIL_VERSION"
26-
if [[ ! -f $UTIL_FILEPATH ]];then
27-
wget --quiet -O $UTIL_FILEPATH https://github.com/nhsconnect/prm-deductions-support-infra/releases/download/${UTIL_VERSION}/${UTIL_FILENAME}
28-
fi
29-
chmod +x $UTIL_FILEPATH
30-
31-
echo "$UTIL_FILEPATH"
32-
}
33-
34-
AWS_HELPERS_FILE=$(download_util $AWS_HELPERS_VERSION aws-helpers)
35-
source $AWS_HELPERS_FILE
3612

3713
####################################
3814
# Instance (Environment) Variables #
@@ -72,14 +48,14 @@ function start_localstack {
7248
echo "################################"
7349
echo "##### Starting Localstack ######"
7450
echo "################################"
75-
docker-compose -f docker-compose.localstack-local.yaml up -d
51+
docker compose -f docker-compose.localstack-local.yaml up -d
7652
}
7753

7854
function stop_localstack {
7955
echo "################################"
8056
echo "##### Stopping Localstack ######"
8157
echo "################################"
82-
docker-compose -f docker-compose.localstack-local.yaml down
58+
docker compose -f docker-compose.localstack-local.yaml down
8359
}
8460

8561
###########

0 commit comments

Comments
 (0)