Rename docker image to clarify what it is

sourcegraph · Jun 26, 2024 · e114ec5 · e114ec5
1 parent 795aeda
commit e114ec5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build-env-docker.yml b/.github/workflows/build-env-docker.yml
@@ -6,12 +6,12 @@ name: Create and publish a Docker image for bindings build environment
 # Configures this workflow to run every time a change is pushed to the branch called `release`.
 on:
   push:
-    branches: ['main'] # TODO: set to main
+    branches: ['main']
 
 # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: sourcegraph/scip-bindings-env
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
@@ -45,7 +45,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} # TODO: set to main
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
         # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
         # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.

diff --git a/cmd/scip/tests/reprolang/generate-tree-sitter-parser.sh b/cmd/scip/tests/reprolang/generate-tree-sitter-parser.sh
@@ -3,5 +3,8 @@ set -eux
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 cd "$SCRIPT_DIR"
 yarn install
+
+# See https://github.com/smacker/go-tree-sitter/issues/85#issuecomment-1287988200
 ./node_modules/.bin/tree-sitter generate --abi 13
+
 yarn --cwd ../../../.. run prettier
diff --git a/dev/build-docker-environment.sh b/dev/build-docker-environment.sh
@@ -6,4 +6,4 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.." # cd to repo root dir
 
 IMAGE_NAME="sourcegraph/scip-bindings-env"
 
-docker build . -t $IMAGE_NAME -f ./dev/Dockerfile.bindings --cache-from ghcr.io/sourcegraph/scip:latest && echo $IMAGE_NAME
+docker build . -t $IMAGE_NAME -f ./dev/Dockerfile.bindings --cache-from ghcr.io/$IMAGE_NAME:latest && echo $IMAGE_NAME
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.." # cd to repo root dir

		IMAGE_NAME="sourcegraph/scip-bindings-env"

		docker build . -t $IMAGE_NAME -f ./dev/Dockerfile.bindings --cache-from ghcr.io/sourcegraph/scip:latest && echo $IMAGE_NAME
		docker build . -t $IMAGE_NAME -f ./dev/Dockerfile.bindings --cache-from ghcr.io/$IMAGE_NAME:latest && echo $IMAGE_NAME