Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove dockerize submodule #266

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Remove dockerize submodule #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
path = tctl
url = https://github.com/temporalio/tctl
branch = main
[submodule "dockerize"]
path = dockerize
url = https://github.com/jwilder/dockerize.git
[submodule "cli"]
path = cli
url = https://github.com/temporalio/cli.git
Expand Down
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ CGO_ENABLED ?= 0
TEMPORAL_ROOT := temporal
TCTL_ROOT := tctl
CLI_ROOT := cli
DOCKERIZE_ROOT := dockerize
IMAGE_TAG ?= sha-$(shell git rev-parse --short HEAD)
TEMPORAL_SHA := $(shell sh -c 'git submodule status -- temporal | cut -c2-40')
TCTL_SHA := $(shell sh -c "git submodule status -- tctl | cut -c2-40")
Expand Down Expand Up @@ -46,7 +45,6 @@ update-submodules:
# $* expands to the stem that matches the %, so when the target is amd64-bins $* expands to amd64
%-bins:
@mkdir -p build/$*
@cd $(DOCKERIZE_ROOT) && CGO_ENABLED=$(CGO_ENABLED) GOOS=linux GOARCH=$* go build -o ../build/$*/dockerize .
@GOOS=linux GOARCH=$* CGO_ENABLED=$(CGO_ENABLED) make -C $(TEMPORAL_ROOT) clean-bins bins
@cp $(TEMPORAL_ROOT)/temporal-server build/$*/
@cp $(TEMPORAL_ROOT)/temporal-cassandra-tool build/$*/
Expand Down
2 changes: 1 addition & 1 deletion admin-tools.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_ADMIN_TOOLS_IMAGE=temporalio/base-admin-tools:1.12.10
ARG BASE_ADMIN_TOOLS_IMAGE=temporalio/base-admin-tools:1.12.11

##### Admin Tools #####
# This is injected as a context via the bakefile so we don't take it as an ARG
Expand Down
1 change: 0 additions & 1 deletion dockerize
Open in desktop
Submodule dockerize deleted from 5f52f7
3 changes: 1 addition & 2 deletions server.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_SERVER_IMAGE=temporalio/base-server:1.15.10
ARG BASE_SERVER_IMAGE=temporalio/base-server:1.15.11

FROM ${BASE_SERVER_IMAGE} as temporal-server
ARG TARGETARCH
Expand All @@ -22,7 +22,6 @@ ENV TEMPORAL_SHA=${TEMPORAL_SHA}
ENV TCTL_SHA=${TCTL_SHA}

# binaries
COPY ./build/${TARGETARCH}/dockerize /usr/local/bin/dockerize
COPY ./build/${TARGETARCH}/tctl /usr/local/bin
COPY ./build/${TARGETARCH}/tctl-authorization-plugin /usr/local/bin
COPY ./build/${TARGETARCH}/temporal-server /usr/local/bin
Expand Down
Loading