Skip to content

Commit c374828

Browse files
committed
fix docker build conditions for circle
1 parent 86dec47 commit c374828

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.ci/docker_build

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
#!/bin/bash
22

33
# This script only needs to run on the main Redash repo*
4-
# (modified for Mozilla fork)
4+
# (modified for Mozilla fork and CircleCI)
55
VERSION_TAG="$MOZILLA_VERSION"
66

7-
if [ "${GITHUB_REPOSITORY}" != "mozilla/redash" ]; then
8-
echo "Skipping image build for Docker Hub, as this isn't the main Redash repository"
9-
exit 0
10-
fi
7+
# if [ "${GITHUB_REPOSITORY}" != "mozilla/redash" ]; then
8+
# echo "Skipping image build for Docker Hub, as this isn't the main Redash repository"
9+
# exit 0
10+
# fi
1111

12-
if [ "${GITHUB_REF_NAME}" != "master" ] && [ "${GITHUB_REF_NAME}" != "preview-image" ]; then
13-
echo "Skipping image build for Docker Hub, as this isn't the 'master' nor 'preview-image' branch"
14-
exit 0
15-
fi
12+
# if [ "${GITHUB_REF_NAME}" != "master" ] && [ "${GITHUB_REF_NAME}" != "preview-image" ]; then
13+
# echo "Skipping image build for Docker Hub, as this isn't the 'master' nor 'preview-image' branch"
14+
# exit 0
15+
# fi
1616

17-
if [ "x${DOCKER_USER}" = "x" ] || [ "x${DOCKER_PASS}" = "x" ]; then
18-
echo "Skipping image build for Docker Hub, as the login details aren't available"
19-
exit 0
20-
fi
17+
# if [ "x${DOCKER_USER}" = "x" ] || [ "x${DOCKER_PASS}" = "x" ]; then
18+
# echo "Skipping image build for Docker Hub, as the login details aren't available"
19+
# exit 0
20+
# fi
2121

2222
set -e
2323

compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ x-redash-service: &redash-service
44
build:
55
context: .
66
args:
7-
skip_frontend_build: "true" # set to empty string to build
7+
skip_frontend_build: "true" # set to empty string to build
88
volumes:
99
- .:/app
1010
env_file:

0 commit comments

Comments
 (0)