diff --git a/docker/deployment/Dockerfile b/docker/deployment/Dockerfile index d18f1efc..afd30940 100644 --- a/docker/deployment/Dockerfile +++ b/docker/deployment/Dockerfile @@ -7,9 +7,9 @@ COPY init_portainer.go / RUN go build -o init_portainer /init_portainer.go RUN chmod +x /init_portainer -COPY environment.go / -RUN go build -o environment /environment.go -RUN chmod +x /environment +COPY endpoint.go / +RUN go build -o endpoint /endpoint.go +RUN chmod +x /endpoint # step2: Copy build go program to portainer # Dockerfile refer to: https://github.com/portainer/portainer/blob/develop/build/linux/Dockerfile @@ -17,6 +17,6 @@ FROM portainer/portainer-ce:2.19.0 LABEL maintainer="websoft9" LABEL version="2.19.0" COPY --from=builder /init_portainer / -COPY --from=builder /environment / +COPY --from=builder /endpoint / ENTRYPOINT ["/init_portainer"] diff --git a/docker/deployment/environment.go b/docker/deployment/endpoint.go similarity index 100% rename from docker/deployment/environment.go rename to docker/deployment/endpoint.go diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml index 0b1229de..f691ac22 100644 --- a/docker/docker-compose-dev.yml +++ b/docker/docker-compose-dev.yml @@ -35,7 +35,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock #- /run/podman/podman.sock:/var/run/docker.sock healthcheck: - test: ["CMD", "/environment"] + test: ["CMD", "/endpoint"] interval: 10s timeout: 30s retries: 4 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d4f27e5f..e0c97f61 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -26,7 +26,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock #- /run/podman/podman.sock:/var/run/docker.sock healthcheck: - test: ["CMD", "/environment"] + test: ["CMD", "/endpoint"] interval: 10s timeout: 30s retries: 4 diff --git a/version.json b/version.json index 61a38877..592c9d7b 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "0.8.26-rc71", + "version": "0.8.26-rc72", "plugins": { "portainer": "0.0.7", "nginx": "0.0.5",