nomad/hoppscotch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 2024.9.3 and expose envoy metrics

Browse Source
This commit is contained in:
Daniel Berteaud 2024-10-18 12:04:16 +02:00
parent ea49508e26
commit e668a40f03
5 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
example/hoppscotch.nomad.hcl
View File

@ -22,9 +22,21 @@ job "hoppscotch" {
service {
name = "hoppscotch"
port = 8487
meta {
alloc = "${NOMAD_ALLOC_INDEX}"
datacenter = "${NOMAD_DC}"
group = "${NOMAD_GROUP_NAME}"
job = "${NOMAD_JOB_NAME}"
namespace = "${NOMAD_NAMESPACE}"
node = "${node.unique.name}"
region = "${NOMAD_REGION}"
}
connect {
sidecar_service {
proxy {
config {
}
upstreams {
destination_name = "postgres"
local_bind_port = 5432
@ -132,12 +144,15 @@ job "hoppscotch" {
task "frontend" {
driver = "docker"
config {
image = "danielberteaud/hoppscotch-frontend:2024.9.2-1"
image = "danielberteaud/hoppscotch-frontend:2024.9.3-1"
readonly_rootfs = true
pids_limit = 100
@ -246,7 +261,7 @@ _EOT
driver = "docker"
config {
image = "danielberteaud/hoppscotch-backend:2024.9.2-1"
image = "danielberteaud/hoppscotch-backend:2024.9.3-1"
readonly_rootfs = true
pids_limit = 200

6
example/images/hoppscotch-backend/Dockerfile
View File

@ -1,6 +1,6 @@
FROM danielberteaud/alpine:24.10-1 AS builder
FROM danielberteaud/alpine:24.10-2 AS builder
ARG HOPPSCOTCH_VERSION=2024.9.2
ARG HOPPSCOTCH_VERSION=2024.9.3
RUN set -euxo pipefail &&\
apk add --no-cache \
@ -22,7 +22,7 @@ RUN set -euxo pipefail &&\
pnpm prune --prod --no-optional --ignore-scripts &&\
rdfind -makehardlinks true node_modules
FROM danielberteaud/alpine:24.10-1
FROM danielberteaud/alpine:24.10-2
LABEL maintainer="Daniel Berteaud <dbd@ehtrace.com>"
ENV PRODUCTION=true \

6
example/images/hoppscotch-frontend/Dockerfile
View File

@ -1,6 +1,6 @@
FROM danielberteaud/alpine:24.10-1 AS builder
FROM danielberteaud/alpine:24.10-2 AS builder
ARG HOPPSCOTCH_VERSION=2024.9.2
ARG HOPPSCOTCH_VERSION=2024.9.3
ENV HOPP_ALLOW_RUNTIME_ENV=true
RUN set -euxo pipefail &&\
@ -23,7 +23,7 @@ RUN set -euxo pipefail &&\
cd /tmp/hoppscotch/packages/hoppscotch-sh-admin &&\
pnpm run build --outDir dist-subpath-access --base /admin/
FROM danielberteaud/alpine:24.10-1
FROM danielberteaud/alpine:24.10-2
LABEL maintainer="Daniel Berteaud <dbd@ehtrace.com>"
ENV LISTEN_PORT=8080 \

5
hoppscotch.nomad.hcl
View File

@ -9,11 +9,15 @@ job "[[ .instance ]]" {
network {
mode = "bridge"
[[- if conv.ToBool $c.prometheus.enabled ]]
port "metrics" {}
[[- end ]]
}
service {
name = "[[ .instance ]][[ .consul.suffix ]]"
port = 8487
[[ template "common/service_meta" $c ]]
[[ template "common/connect" $c ]]
check {
@ -32,6 +36,7 @@ job "[[ .instance ]]" {
[[ template "common/task.wait_for" $c ]]
[[ template "common/task.pgpooler" $c ]]
[[ template "common/task.metrics_proxy" $c ]]
task "frontend" {
[[- $d := merge $c.frontend $c ]]

2
variables.yml
View File

@ -5,7 +5,7 @@ instance: hoppscotch
hoppscotch:
# Version of hoppscotch to use
version: 2024.9.2
version: 2024.9.3
# Public URL where hoppscotch will be exposed
public_url: https://hoppscotch.example.org