Skip to content

Commit 46d317a

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 98fb8bb commit 46d317a

File tree

4 files changed

+49
-49
lines changed

4 files changed

+49
-49
lines changed

reports/pagespeedresult.svg

Lines changed: 1 addition & 1 deletion
Loading

reports/pagespeedresultmobile.svg

Lines changed: 1 addition & 1 deletion
Loading

scripts/docker-build.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,35 +38,35 @@ DOCKER_CMD=${DOCKER_CMD:-$(command -v docker 2>/dev/null || command -v podman 2>
3838
DOCKER_OPTS=${DOCKER_OPTS:-"--rm --progress plain --force-rm true --no-cache true --shm-size=1G"}
3939

4040
main() {
41-
echo 'Building docker container...'
41+
echo 'Building docker container...'
4242

43-
# docker file tag
44-
local tag
45-
tag="$1"
46-
shift
43+
# docker file tag
44+
local tag
45+
tag="$1"
46+
shift
4747

48-
# docker architecture
49-
local architecture
50-
architecture="$1"
51-
shift
48+
# docker architecture
49+
local architecture
50+
architecture="$1"
51+
shift
5252

53-
case "$architecture" in
53+
case "$architecture" in
5454
amd64) platform="linux/amd64" ;;
5555
arm64) platform="linux/arm64" ;;
5656
armhf) platform="linux/arm/7" ;;
57-
esac
57+
esac
5858

59-
# Build docker image
60-
$DOCKER_CMD build \
61-
--platform "$platform" \
62-
$DOCKER_OPTS \
63-
"${@:2}" \
64-
--file "${DOCKER_DIR}/${tag}.Dockerfile" \
65-
--tag "${IMAGE_REPOSITORY}:${IMAGE_TAG}" \
66-
--tag "${IMAGE_REPOSITORY}:${GIT_SHA}" \
67-
--build-arg BUILD_DATE=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
68-
--build-arg VCS_REF=$(shell git rev-parse --short HEAD) \
69-
"$BASE_DIR"
59+
# Build docker image
60+
$DOCKER_CMD build \
61+
--platform "$platform" \
62+
$DOCKER_OPTS \
63+
"${@:2}" \
64+
--file "${DOCKER_DIR}/${tag}.Dockerfile" \
65+
--tag "${IMAGE_REPOSITORY}:${IMAGE_TAG}" \
66+
--tag "${IMAGE_REPOSITORY}:${GIT_SHA}" \
67+
--build-arg BUILD_DATE=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
68+
--build-arg VCS_REF=$(shell git rev-parse --short HEAD) \
69+
"$BASE_DIR"
7070
}
7171

7272
[[ "$0" == "$BASH_SOURCE" ]] && main "$@"

scripts/docker-rebuild.sh

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,39 @@ DOCKER_CMD=${DOCKER_CMD:-$(command -v docker 2>/dev/null || command -v podman 2>
3838
DOCKER_OPTS=${DOCKER_OPTS:-"--rm --progress plain --force-rm true --no-cache true --shm-size=1G"}
3939

4040
main() {
41-
echo ">>> Rebuilding docker container..."
41+
echo ">>> Rebuilding docker container..."
4242

43-
# docker file tag
44-
local tag
45-
tag="$1"
46-
shift
43+
# docker file tag
44+
local tag
45+
tag="$1"
46+
shift
4747

48-
# docker architecture
49-
local architecture
50-
architecture="$1"
51-
shift
48+
# docker architecture
49+
local architecture
50+
architecture="$1"
51+
shift
5252

53-
# docker file path
54-
local file
55-
file="${DOCKER_DIR}/${tag}.Dockerfile"
53+
# docker file path
54+
local file
55+
file="${DOCKER_DIR}/${tag}.Dockerfile"
5656

57-
case "$architecture" in
57+
case "$architecture" in
5858
amd64) platform="linux/amd64" ;;
5959
arm64) platform="linux/arm64" ;;
6060
armhf) platform="linux/arm/7" ;;
61-
esac
61+
esac
6262

63-
# Build docker image
64-
$DOCKER_CMD build \
65-
--platform "$platform" \
66-
$DOCKER_OPTS \
67-
"${@:2}" \
68-
--file "$file" \
69-
--tag "${IMAGE_REPOSITORY}:${IMAGE_TAG}" \
70-
--tag "${IMAGE_REPOSITORY}:${GIT_SHA}" \
71-
--build-arg BUILD_DATE=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
72-
--build-arg VCS_REF=$(shell git rev-parse --short HEAD) \
73-
"$BASE_DIR"
63+
# Build docker image
64+
$DOCKER_CMD build \
65+
--platform "$platform" \
66+
$DOCKER_OPTS \
67+
"${@:2}" \
68+
--file "$file" \
69+
--tag "${IMAGE_REPOSITORY}:${IMAGE_TAG}" \
70+
--tag "${IMAGE_REPOSITORY}:${GIT_SHA}" \
71+
--build-arg BUILD_DATE=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
72+
--build-arg VCS_REF=$(shell git rev-parse --short HEAD) \
73+
"$BASE_DIR"
7474
}
7575

7676
[[ "$0" == "$BASH_SOURCE" ]] && main "$@"

0 commit comments

Comments
 (0)