reenable circleci for now

Author: mikewilli

.ci/docker_build

@@ -1,8 +1,10 @@
 #!/bin/bash
 
-# This script only needs to run on the main Redash repo
+# This script only needs to run on the main Redash repo*
+# (modified for Mozilla fork)
+VERSION_TAG="$MOZILLA_VERSION"
 
-if [ "${GITHUB_REPOSITORY}" != "getredash/redash" ]; then
+if [ "${GITHUB_REPOSITORY}" != "mozilla/redash" ]; then
 	echo "Skipping image build for Docker Hub, as this isn't the main Redash repository"
 	exit 0
 fi
@@ -18,22 +20,16 @@ if [ "x${DOCKER_USER}" = "x" ] || [ "x${DOCKER_PASS}" = "x" ]; then
 fi
 
 set -e
-VERSION=$(jq -r .version package.json)
-VERSION_TAG="$VERSION.b${GITHUB_RUN_ID}.${GITHUB_RUN_NUMBER}"
 
 export DOCKER_BUILDKIT=1
 export COMPOSE_DOCKER_CLI_BUILD=1
 
 docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"
 
-DOCKERHUB_REPO="redash/redash"
-DOCKER_TAGS="-t redash/redash:preview -t redash/preview:${VERSION_TAG}"
-
 # Build the docker container
-docker build --build-arg install_groups="main,all_ds,dev" ${DOCKER_TAGS} .
+docker build --build-arg install_groups="main,all_ds,dev" ${DOCKERHUB_REPO}:${VERSION_TAG} .
 
 # Push the container to the preview build locations
-docker push "${DOCKERHUB_REPO}:preview"
-docker push "redash/preview:${VERSION_TAG}"
+docker push "${DOCKERHUB_REPO}:${VERSION_TAG}"
 
 echo "Built: ${VERSION_TAG}"

.circleci/config.yml

@@ -151,41 +151,41 @@ workflows:
   version: 2
   build:
     jobs:
-      # - backend-lint:
-      #     filters:
-      #       tags:
-      #         only: /^m[0-9]+(\.[0-9]+)?$/
-      # - backend-unit-tests:
-      #     filters:
-      #       tags:
-      #         only: /^m[0-9]+(\.[0-9]+)?$/
-      #     requires:
-      #       - backend-lint
-      # - frontend-lint:
-      #     filters:
-      #       tags:
-      #         only: /^m[0-9]+(\.[0-9]+)?$/
-      # - frontend-unit-tests:
-      #     filters:
-      #       tags:
-      #         only: /^m[0-9]+(\.[0-9]+)?$/
-      #     requires:
-      #       - backend-lint
-      #       - frontend-lint
-      # - build-docker-image:
-      #     requires:
-      #       - backend-unit-tests
-      #       - frontend-unit-tests
-      #     filters:
-      #       branches:
-      #         only:
-      #           - master
-      # - build-docker-image-tag:
-      #     requires:
-      #       - backend-unit-tests
-      #       - frontend-unit-tests
-      #     filters:
-      #       branches:
-      #         ignore: /.*/
-      #       tags:
-      #         only: /^m[0-9]+(\.[0-9]+)?$/
+      - backend-lint:
+          filters:
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/
+      - backend-unit-tests:
+          filters:
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/
+          requires:
+            - backend-lint
+      - frontend-lint:
+          filters:
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/
+      - frontend-unit-tests:
+          filters:
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/
+          requires:
+            - backend-lint
+            - frontend-lint
+      - build-docker-image:
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+          filters:
+            branches:
+              only:
+                - master
+      - build-docker-image-tag:
+          requires:
+            - backend-unit-tests
+            - frontend-unit-tests
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^m[0-9]+(\.[0-9]+)?$/