Skip to content

Commit 285ffa2

Browse files
committed
chore(stacks): always pull base
1 parent 43d3197 commit 285ffa2

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CODENAME="${CODENAME:?codename is required}"
1414
# buildpack-dep image name
1515
BUILDPACK_DEP_IMAGE="${DRYCC_REGISTRY}"/drycc/buildpack-dep:"${CODENAME}"
1616
# build buildpack-dep image
17-
docker build -f "${CURRENT_DIR}"/Dockerfile --build-arg CODENAME="${CODENAME}" --build-arg DRYCC_REGISTRY="${DRYCC_REGISTRY}" . -t "${BUILDPACK_DEP_IMAGE}"
17+
docker build --pull -f "${CURRENT_DIR}"/Dockerfile --build-arg CODENAME="${CODENAME}" --build-arg DRYCC_REGISTRY="${DRYCC_REGISTRY}" . -t "${BUILDPACK_DEP_IMAGE}"
1818

1919
function build {
2020
mkdir -p "$DIST_DIR"

stacks/rabbitmq/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ EOF
1414
curl -fsSL -o tmp.tar.xz https://github.com/rabbitmq/rabbitmq-server/releases/download/v${STACK_VERSION}/rabbitmq-server-generic-unix-${STACK_VERSION}.tar.xz
1515
xz -d tmp.tar.xz
1616
tar -xvf tmp.tar
17-
cp -rf rabbitmq_server-3.9.13/* "${DATA_DIR}"
17+
cp -rf rabbitmq_server-${STACK_VERSION}/* "${DATA_DIR}"
1818
cp "${DATA_DIR}"/plugins/rabbitmq_management-*/priv/www/cli/rabbitmqadmin "${TARNAME}"/data/sbin
1919
chmod +x "${DATA_DIR}"/sbin/rabbitmqadmin
20-
rm -rf tmp.tar rabbitmq_server-3.9.13
20+
rm -rf tmp.tar rabbitmq_server-${STACK_VERSION}
2121
}
2222

2323
# call build stack
2424
build-stack "${1}"
2525

26-

0 commit comments

Comments
 (0)