diff --git a/data/haproxy-http.Dockerfile b/data/haproxy-http.Dockerfile index de5246628..089ae0f96 100644 --- a/data/haproxy-http.Dockerfile +++ b/data/haproxy-http.Dockerfile @@ -1,6 +1,6 @@ FROM haproxytech/haproxy-alpine:2.5 RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe -COPY haproxy/haproxy.cfg-http.template /usr/local/etc/haproxy/haproxy.cfg -COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl -COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem \ No newline at end of file +COPY data/haproxy/haproxy.cfg-http.template /usr/local/etc/haproxy/haproxy.cfg +COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl +COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem \ No newline at end of file diff --git a/data/haproxy-tcp.Dockerfile b/data/haproxy-tcp.Dockerfile index 9b9639777..bddcbe541 100644 --- a/data/haproxy-tcp.Dockerfile +++ b/data/haproxy-tcp.Dockerfile @@ -1,6 +1,6 @@ FROM haproxytech/haproxy-alpine:2.5 RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe -COPY haproxy/haproxy.cfg-tcp.template /usr/local/etc/haproxy/haproxy.cfg -COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl -COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem \ No newline at end of file +COPY data/haproxy/haproxy.cfg-tcp.template /usr/local/etc/haproxy/haproxy.cfg +COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl +COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem \ No newline at end of file diff --git a/data/haproxy.Dockerfile b/data/haproxy.Dockerfile index 3ab520a65..45e2d9d71 100644 --- a/data/haproxy.Dockerfile +++ b/data/haproxy.Dockerfile @@ -1,6 +1,6 @@ FROM haproxytech/haproxy-alpine:2.5 RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe -COPY haproxy/haproxy.cfg.template /usr/local/etc/haproxy/haproxy.cfg -COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl -COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem \ No newline at end of file +COPY data/haproxy/haproxy.cfg.template /usr/local/etc/haproxy/haproxy.cfg +COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl +COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem \ No newline at end of file diff --git a/package.json b/package.json index ceef4b161..6069fa22c 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "release:production:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .", "release:staging:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version --push .", "release:staging:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version --push .", - "release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f haproxy.Dockerfile --push .", - "release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f haproxy-tcp.Dockerfile --push .", - "release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f haproxy-http.Dockerfile --push .", + "release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f data/haproxy.Dockerfile --push .", + "release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f data/haproxy-tcp.Dockerfile --push .", + "release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f data/haproxy-http.Dockerfile --push .", "prepare": "husky install" }, "devDependencies": {