Skip to content

Commit

Permalink
Gh-341: Fix Actions legacy images build (#342)
Browse files Browse the repository at this point in the history
* Create a new script for building just images required to have legacy compatibility
  • Loading branch information
GCHQDeveloper314 authored Feb 21, 2024
1 parent 53cbf18 commit 027092e
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2023 Crown Copyright
# Copyright 2020-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -108,8 +108,8 @@ jobs:
- name: Build images with Accumulo 2 dependency
run: ./cd/build_images.sh ./docker/accumulo2.env

- name: Build images with Accumulo 1 dependency (Legacy)
run: ./cd/build_images.sh ./docker/accumulo1.env
- name: Build core images with Accumulo 1 dependency (Legacy)
run: ./cd/build_core_images.sh ./docker/accumulo1.env

- name: Publish images
env:
Expand Down
41 changes: 41 additions & 0 deletions cd/build_core_images.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/bash

# Copyright 2020-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# -a: Always export variables to subsequent commands.
# Required for variables from sourced env file to automatically be visible to docker compose.
set -e -a

ROOT_DIR="$(readlink -f "$(dirname "$(dirname "${0}")")")"

pushd "${ROOT_DIR}" || exit 1

# The following env file will be sourced to set:
# HADOOP_VERSION
# GAFFER_VERSION
# ACCUMULO_VERSION
# TINKERPOP_VERSION
if [[ -f "${1}" ]]; then
source "${1}"
else
echo "Error - Environment file not set"
exit 1
fi

# Builds the Gaffer and Accumulo related images:
docker compose --project-directory ./docker/accumulo/ -f ./docker/accumulo/docker-compose.yaml build
docker compose --project-directory ./docker/gaffer-road-traffic-loader/ -f ./docker/gaffer-road-traffic-loader/docker-compose.yaml build

popd || exit 1

0 comments on commit 027092e

Please sign in to comment.