mirror of
https://github.com/coder/coder.git
synced 2026-09-22 13:10:21 +08:00
fix: Make deploy use new build scripts (#406)
This commit is contained in:
@@ -21,8 +21,8 @@ database/generate: fmt/sql database/dump.sql database/query.sql
|
||||
.PHONY: database/generate
|
||||
|
||||
docker/image/coder: build
|
||||
cp ./images/coder/run.sh ./bin
|
||||
docker build --network=host -t us-docker.pkg.dev/coder-blacktriangle-dev/ci/coder:latest -f images/coder/Dockerfile ./bin
|
||||
cp ./images/coder/run.sh ./dist/coder_$(GOOS)_$(GOARCH)
|
||||
docker build --network=host -t us-docker.pkg.dev/coder-blacktriangle-dev/ci/coder:latest -f images/coder/Dockerfile ./dist/coder_$(GOOS)_$(GOARCH)
|
||||
.PHONY: docker/build
|
||||
|
||||
fmt/prettier:
|
||||
|
||||
@@ -4,14 +4,10 @@ RUN yum install -y yum-utils
|
||||
RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
|
||||
RUN yum install -y terraform
|
||||
|
||||
COPY coderd /coder/coderd
|
||||
RUN chmod +x /coder/coderd
|
||||
COPY coder /coder
|
||||
RUN chmod +x /coder
|
||||
|
||||
COPY run.sh /coder/run.sh
|
||||
RUN chmod +x /coder/run.sh
|
||||
|
||||
# Once `provisionerd` is available, we'll also need that binary
|
||||
# COPY bin/provisionerd /provisionerd
|
||||
# RUN chmod +x /provisionerd
|
||||
COPY run.sh /run.sh
|
||||
RUN chmod +x /run.sh
|
||||
|
||||
ENTRYPOINT ["/coder/run.sh"]
|
||||
|
||||
+1
-1
@@ -26,5 +26,5 @@ function create_initial_user() {
|
||||
(
|
||||
trap 'kill 0' SIGINT
|
||||
create_initial_user &
|
||||
/coder/coderd --address=":$PORT"
|
||||
/coder daemon --address=":$PORT"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user