Skip to content

Commit 57318e1

Browse files
committed
Add version to build infrastructure
1 parent 338e516 commit 57318e1

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
set -e
44

55
PACKAGE=introspector
6+
VERSION=${1:-latest}
67

78
echo "Building images"
8-
docker/build.sh $PACKAGE
9+
docker/build.sh $PACKAGE $VERSION
910

1011
echo "Building launcher"
1112
launcher/build.sh
1213

1314
mkdir -p dist
1415

15-
1616
INTROSPECTOR_DOCKER_REPO=${DOCKER_REPO:-goldfig}
1717
IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}"
1818
ESCAPED_IMAGE=$(printf '%s\n' "$IMAGE" | sed -e 's/[\/&]/\\&/g')
19-
sed "s/build: ./image: ${ESCAPED_IMAGE}:latest/g" docker-compose.yml > dist/docker-compose.yml
19+
sed "s/build: ./image: ${ESCAPED_IMAGE}:${VERSION}/g" docker-compose.yml > dist/docker-compose.yml
2020
cp launcher/dist/* dist/
2121

2222
cd dist

docker/build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set -e
22

33
PACKAGE=$1
4+
VERSION=$2
45
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
5-
${DIR}/build_arm.sh $PACKAGE
6-
${DIR}/build_amd.sh $PACKAGE
6+
${DIR}/build_arm.sh $PACKAGE $VERSION
7+
${DIR}/build_amd.sh $PACKAGE $VERSION

docker/build_amd.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
set -e
22

33
PACKAGE=$1
4+
VERSION=$2
45

56
echo "Building package ${PACKAGE}"
67

78
pipenv lock -r > requirements.txt
89

910
INTROSPECTOR_DOCKER_REPO=${DOCKER_REPO:-goldfig}
10-
IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}:amd64-latest"
11+
IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}:amd64-${VERSION}"
1112
DOCKER_BUILDKIT=1 docker build --platform linux/amd64 -t ${IMAGE} -f docker/Dockerfile-amd .

docker/build_arm.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -e
44

55
PACKAGE=$1
6+
VERSION=$2
67

78
export DOCKER_BUILDKIT=1
89
WHEEL_TAG=goldfig/tempbuildwheel:latest
@@ -23,7 +24,7 @@ sed '/psycopg2-binary.*/d' requirements.tmp > requirements.txt
2324
rm requirements.tmp
2425

2526
INTROSPECTOR_DOCKER_REPO=${DOCKER_REPO:-goldfig}
26-
IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}:arm64-latest"
27+
IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}:arm64-${VERSION}"
2728
DOCKER_BUILDKIT=1 docker build -f docker/Dockerfile-arm --platform linux/arm64 -t ${IMAGE} .
2829

2930
echo "Built ${IMAGE}"

0 commit comments

Comments
 (0)