Merge pull request #13 from Rungutan/issues-11

Issues 11
Rungutan · Jan 23, 2021 · 6da9188 · 6da9188
2 parents c482f9e + f038c4a
commit 6da9188
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 45 deletions.
diff --git a/.github/workflows/main-push-docker-latest.yml b/.github/workflows/main-push-docker-latest.yml
@@ -5,7 +5,7 @@ on:
     branches: main
 
 jobs:
-  main:
+  sentry-base:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -39,6 +39,30 @@ jobs:
           tags: |
             rungutancommunity/sentry-base:latest
             public.ecr.aws/x7u7j5v7/sentry-base:latest
+  sentry-relay:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push Sentry Relay image
         id: docker_build_sentry_relay
         uses: docker/build-push-action@v2
@@ -49,6 +73,30 @@ jobs:
           tags: |
             rungutancommunity/sentry-relay:latest
             public.ecr.aws/x7u7j5v7/sentry-relay:latest
+  sentry-snuba:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push Sentry Snuba image
         id: docker_build_sentry_snuba
         uses: docker/build-push-action@v2
@@ -59,6 +107,30 @@ jobs:
           tags: |
             rungutancommunity/sentry-snuba:latest
             public.ecr.aws/x7u7j5v7/sentry-snuba:latest
+  bassh:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push Bash image
         id: docker_build_bash
         uses: docker/build-push-action@v2
@@ -69,6 +141,30 @@ jobs:
           tags: |
             rungutancommunity/bash:latest
             public.ecr.aws/x7u7j5v7/bash:latest
+  clickhouse-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push ClickHouse Client image
         id: docker_build_clickhouse_client
         uses: docker/build-push-action@v2

diff --git a/.github/workflows/release-push-docker-tag.yml b/.github/workflows/release-push-docker-tag.yml
@@ -6,7 +6,7 @@ on:
     - '*'
 
 jobs:
-  main:
+  sentry-base:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -43,6 +43,33 @@ jobs:
           tags: |
             rungutancommunity/sentry-base:${{ steps.get_version.outputs.VERSION }}
             public.ecr.aws/x7u7j5v7/sentry-base:${{ steps.get_version.outputs.VERSION }}
+  sentry-relay:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push Sentry Relay image
         id: docker_build_sentry_relay
         uses: docker/build-push-action@v2
@@ -53,6 +80,33 @@ jobs:
           tags: |
             rungutancommunity/sentry-relay:${{ steps.get_version.outputs.VERSION }}
             public.ecr.aws/x7u7j5v7/sentry-relay:${{ steps.get_version.outputs.VERSION }}
+  sentry-snuba:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push Sentry Snuba image
         id: docker_build_sentry_snuba
         uses: docker/build-push-action@v2
@@ -63,6 +117,33 @@ jobs:
           tags: |
             rungutancommunity/sentry-snuba:${{ steps.get_version.outputs.VERSION }}
             public.ecr.aws/x7u7j5v7/sentry-snuba:${{ steps.get_version.outputs.VERSION }}
+  bash:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push Bash image
         id: docker_build_bash
         uses: docker/build-push-action@v2
@@ -73,6 +154,33 @@ jobs:
           tags: |
             rungutancommunity/bash:${{ steps.get_version.outputs.VERSION }}
             public.ecr.aws/x7u7j5v7/bash:${{ steps.get_version.outputs.VERSION }}
+  clickhouse-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to ECR
+        uses: docker/login-action@v1
+        with:
+          registry: public.ecr.aws
+          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        env:
+          AWS_REGION: ${{ secrets.AWS_REGION }}
       - name: Build and push ClickHouse Client image
         id: docker_build_clickhouse_client
         uses: docker/build-push-action@v2

diff --git a/cloudformation-template.yaml b/cloudformation-template.yaml
@@ -177,7 +177,7 @@ Parameters:
   # OpsWorks ClickHouse variables
   ClickHouseCookbookUrl:
     Type: String
-    Default: https://github.com/Rungutan/sentry-performance-monitoring/releases/download/1.5.0/clickhouse-1.5.0.tar.gz
+    Default: https://github.com/Rungutan/sentry-performance-monitoring/releases/download/1.6.0/clickhouse-1.6.0.tar.gz
 
   ClickHouseInstanceType:
     Type: String
@@ -205,28 +205,28 @@ Parameters:
 
   SentryImage:
     Type: String
-    Default: public.ecr.aws/x7u7j5v7/sentry-base:1.5.0
-    Description: Public ECR = public.ecr.aws/x7u7j5v7/sentry-base:1.5.0 <AND> Docker HUB = rungutancommunity/sentry-base:1.5.0
+    Default: public.ecr.aws/x7u7j5v7/sentry-base:1.6.0
+    Description: Public ECR = public.ecr.aws/x7u7j5v7/sentry-base:1.6.0 <AND> Docker HUB = rungutancommunity/sentry-base:1.6.0
 
   SnubaImage:
     Type: String
-    Default: public.ecr.aws/x7u7j5v7/sentry-snuba:1.5.0
-    Description: Public ECR = public.ecr.aws/x7u7j5v7/sentry-snuba:1.5.0 <AND> Docker HUB = rungutancommunity/sentry-snuba:1.5.0
+    Default: public.ecr.aws/x7u7j5v7/sentry-snuba:1.6.0
+    Description: Public ECR = public.ecr.aws/x7u7j5v7/sentry-snuba:1.6.0 <AND> Docker HUB = rungutancommunity/sentry-snuba:1.6.0
 
   RelayImage:
     Type: String
-    Default: public.ecr.aws/x7u7j5v7/sentry-relay:1.5.0
-    Description: Public ECR = public.ecr.aws/x7u7j5v7/sentry-relay:1.5.0 <AND> Docker HUB = rungutancommunity/sentry-relay:1.5.0
+    Default: public.ecr.aws/x7u7j5v7/sentry-relay:1.6.0
+    Description: Public ECR = public.ecr.aws/x7u7j5v7/sentry-relay:1.6.0 <AND> Docker HUB = rungutancommunity/sentry-relay:1.6.0
 
   BashImage:
     Type: String
-    Default: public.ecr.aws/x7u7j5v7/bash:1.5.0
-    Description: Public ECR = public.ecr.aws/x7u7j5v7/bash:1.5.0 <AND> Docker HUB = rungutancommunity/bash:1.5.0
+    Default: public.ecr.aws/x7u7j5v7/bash:1.6.0
+    Description: Public ECR = public.ecr.aws/x7u7j5v7/bash:1.6.0 <AND> Docker HUB = rungutancommunity/bash:1.6.0
 
   ClickHouseImage:
     Type: String
-    Default: public.ecr.aws/x7u7j5v7/clickhouse-client:1.5.0
-    Description: Public ECR = public.ecr.aws/x7u7j5v7/clickhouse-client:1.5.0 <AND> Docker HUB = rungutancommunity/clickhouse-client:1.5.0
+    Default: public.ecr.aws/x7u7j5v7/clickhouse-client:1.6.0
+    Description: Public ECR = public.ecr.aws/x7u7j5v7/clickhouse-client:1.6.0 <AND> Docker HUB = rungutancommunity/clickhouse-client:1.6.0
 
   MinCountSnubaApi:
     Type: String

diff --git a/docker/relay/docker-alt-entrypoint.sh b/docker/relay/docker-alt-entrypoint.sh
@@ -13,43 +13,13 @@ fi
 mkdir -p /work/.relay/ && chown -R relay:relay /work
 (cp ${CONFIG_FILE_PATH} /work/.relay/config.yml) || true
 
-# Sleep for the specified number of seconds before starting.
-# For example, can be helpful to synchronize container startup in Kubernetes environment.
-if [[ -n "${RELAY_DELAY_STARTUP_SECONDS:-}" ]]; then
-  echo "Sleeping for ${RELAY_DELAY_STARTUP_SECONDS}s..."
-  sleep "${RELAY_DELAY_STARTUP_SECONDS}"
-fi
-
-# Make sure that a specified URL (e.g. the upstream or a proxy sidecar) is reachable before starting.
-# Only 200 response is accepted as success.
-if [[ -n "${RELAY_PRESTART_ENDPOINT:-}" ]]; then
-  max_retry="${RELAY_PRESTART_MAX_RETRIES:-120}"
-  curl_timeout="${RELAY_PRESTART_REQUEST_TIMEOUT:-1}"
-  for attempt in $(seq 0 "${max_retry}"); do
-    if [[ "${attempt}" == "${max_retry}" ]]; then
-      echo "The prestart endpoint has not returned 200 after ${max_retry} attempts, exiting!"
-      exit 1
-    fi
-    status=$(curl --max-time "${curl_timeout}" --show-error --silent \
-                  --output /dev/null --write-out "%{http_code}" \
-                  -H 'Connection: close' \
-                  "${RELAY_PRESTART_ENDPOINT}" \
-              || true)
-    if [[ "${status}" == "200" ]]; then
-      break
-    fi
-    echo "Waiting for a 200 response from ${RELAY_PRESTART_ENDPOINT}, got ${status}"
-    sleep 1
-  done
-fi
-
 # For compatibility with older images
 if [ "$1" == "bash" ]; then
-  set -- bash "${@:2}"
+  set -- bash
 elif [ "$(id -u)" == "0" ]; then
   set -- gosu relay /bin/relay "$@"
 else
   set -- /bin/relay "$@"
 fi
 
-exec "$@"
+exec "$@"