Skip to content

Commit

Permalink
Add version to build infrastructure
Browse files Browse the repository at this point in the history
  • Loading branch information
gsoltis committed Mar 25, 2021
1 parent 338e516 commit 57318e1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
set -e

PACKAGE=introspector
VERSION=${1:-latest}

echo "Building images"
docker/build.sh $PACKAGE
docker/build.sh $PACKAGE $VERSION

echo "Building launcher"
launcher/build.sh

mkdir -p dist


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

cd dist
Expand Down
5 changes: 3 additions & 2 deletions docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
set -e

PACKAGE=$1
VERSION=$2
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
${DIR}/build_arm.sh $PACKAGE
${DIR}/build_amd.sh $PACKAGE
${DIR}/build_arm.sh $PACKAGE $VERSION
${DIR}/build_amd.sh $PACKAGE $VERSION
3 changes: 2 additions & 1 deletion docker/build_amd.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
set -e

PACKAGE=$1
VERSION=$2

echo "Building package ${PACKAGE}"

pipenv lock -r > requirements.txt

INTROSPECTOR_DOCKER_REPO=${DOCKER_REPO:-goldfig}
IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}:amd64-latest"
IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}:amd64-${VERSION}"
DOCKER_BUILDKIT=1 docker build --platform linux/amd64 -t ${IMAGE} -f docker/Dockerfile-amd .
3 changes: 2 additions & 1 deletion docker/build_arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
set -e

PACKAGE=$1
VERSION=$2

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

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

echo "Built ${IMAGE}"

0 comments on commit 57318e1

Please sign in to comment.