Update docker paths

baking-bad · Jan 4, 2024 · e79b078 · e79b078
1 parent 1fad9c1
commit e79b078
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,4 @@
 target/
 benchmark/
-bin/
-.tezos-client/
 .db/
 .git/
diff --git a/.github/workflows/kernel.yml b/.github/workflows/kernel.yml
@@ -44,7 +44,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: build/kernel/Dockerfile
+          file: docker/operator/Dockerfile
           build-args: |
             OCTEZ_TAG=v17.1
             OCTEZ_PROTO=PtNairob

diff --git a/.github/workflows/sequencer.yml b/.github/workflows/sequencer.yml
@@ -42,7 +42,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: build/sequencer/Dockerfile
+          file: docker/sequencer/Dockerfile
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max

diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ build-sequencer:
 	cargo build --package sequencer
 
 image-operator:
-	docker build -t dsn/operator:$(OCTEZ_TAG) --file ./docker/kernel/local.dockerfile \
+	docker build -t dsn/operator:$(OCTEZ_TAG) --file ./docker/operator/local.dockerfile \
 		--build-arg OCTEZ_TAG=$(OCTEZ_TAG) \
 		--build-arg OCTEZ_PROTO=$(OCTEZ_PROTO) \
 		.

diff --git a/docker/kernel/Dockerfile → docker/operator/Dockerfile b/docker/kernel/Dockerfile → docker/operator/Dockerfile
@@ -17,6 +17,6 @@ COPY --from=octez /usr/local/bin/octez-smart-rollup-node-${OCTEZ_PROTO} /usr/bin
 COPY --from=octez /usr/local/bin/octez-client /usr/bin/octez-client
 COPY --from=builder /build/bin/wasm_2_0_0/ /root/wasm_2_0_0/
 COPY --from=builder /build/bin/kernel_installer.wasm /root/kernel.wasm
-COPY ./docker/kernel/entrypoint.sh .
+COPY ./docker/operator/entrypoint.sh .
 RUN chmod +x entrypoint.sh && ln ./entrypoint.sh /usr/bin/operator
 ENTRYPOINT [ "./entrypoint.sh" ]
diff --git a/docker/kernel/entrypoint.sh → docker/operator/entrypoint.sh b/docker/kernel/entrypoint.sh → docker/operator/entrypoint.sh
diff --git a/docker/kernel/local.dockerfile → docker/operator/local.dockerfile b/docker/kernel/local.dockerfile → docker/operator/local.dockerfile
@@ -8,6 +8,6 @@ COPY --from=octez /usr/local/bin/octez-smart-rollup-node-${OCTEZ_PROTO} /usr/bin
 COPY --from=octez /usr/local/bin/octez-client /usr/bin/octez-client
 COPY ./bin/wasm_2_0_0/ /root/wasm_2_0_0/
 COPY ./bin/kernel_installer.wasm /root/kernel.wasm
-COPY ./docker/kernel/entrypoint.sh .
+COPY ./docker/operator/entrypoint.sh .
 RUN chmod +x entrypoint.sh && ln ./entrypoint.sh /usr/bin/operator
 ENTRYPOINT [ "./entrypoint.sh" ]