Skip to content

Commit

Permalink
Cleanup some old configurations (#1435)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tansito authored Aug 2, 2024
1 parent 2f3bac4 commit aefa3f6
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-containers-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ jobs:
file: ./${{ matrix.dockerfile }}
load: true
tags: image:test
build-args:
IMAGE_PY_VERSION=${{ env.python_version }}
- name: Inspect
run: |
docker image inspect image:test
4 changes: 2 additions & 2 deletions .github/workflows/kubernetes-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
kind-worker-count: 0
- name: Build and load gateway
run: |
docker build -t gateway:test --build-arg TARGETARCH="amd64" -f ./gateway/Dockerfile .
docker build -t gateway:test -f ./gateway/Dockerfile .
kind load docker-image gateway:test
docker image rm gateway:test
- name: Build and load ray node
run: |
docker build -t ray:test --build-arg TARGETARCH="amd64" -f ./Dockerfile-ray-node .
docker build -t ray:test -f ./Dockerfile-ray-node .
kind load docker-image ray:test
docker image rm ray:test
- name: Install helm chart
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ If you wish to rebuild only a specific component (for example, the `gateway`), y

```docker compose -f docker-compose-dev.yaml build gateway```

For Apple Silicon system (arm64 / aarch64), set `TARGETARCH=arm64` before running the `docker compose` command.

### Assigning yourself

The very first step to working on an issue is
Expand Down
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

version=latest
repository=icr.io/quantum-public
ifeq ($(shell uname -p), arm)
arch="arm64"
else
arch="amd64"
endif

rayNodeImageName=$(repository)/qiskit-serverless/ray-node
gatewayImageName=$(repository)/qiskit-serverless/gateway
proxyImageName=$(repository)/qiskit-serverless/proxy
Expand All @@ -24,7 +18,7 @@ build-all: build-ray-node build-gateway build-proxy
push-all: push-ray-node push-gateway push-proxy

build-ray-node:
docker build -t $(rayNodeImageName):$(version) --build-arg TARGETARCH=$(arch) -f Dockerfile-ray-node .
docker build -t $(rayNodeImageName):$(version) -f Dockerfile-ray-node .

build-gateway:
docker build -t $(gatewayImageName):$(version) -f ./gateway/Dockerfile .
Expand Down
2 changes: 0 additions & 2 deletions docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ services:
build:
context: ./
dockerfile: Dockerfile-ray-node
args:
TARGETARCH: "${TARGETARCH:-amd64}"
entrypoint: [
"env", "RAY_LOG_TO_STDERR=1", "ray", "start", "--head", "--port=6379",
"--dashboard-host=0.0.0.0", "--block"
Expand Down

0 comments on commit aefa3f6

Please sign in to comment.