Skip to content

Fixed target path when using go templating #9932

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
nicholasdille merged 3 commits into from
Jan 29, 2025
Merged

Fixed target path when using go templating #9932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28da201
Fixed target path when using go templating
nicholasdille Jan 29, 2025
ef4fcf6
Fixed issues caused by tailwindcss v4
nicholasdille Jan 29, 2025
40dd9a3
Fixed order of commands
nicholasdille Jan 29, 2025
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
2 changes: 1 addition & 1 deletion tools/containerd/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tar --file="${uniget_cache_download}/${filename}" --extract --gzip --directory="

curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/containerd.service.go-template" \
"https://github.com/containerd/containerd/raw/v${version}/containerd.service"
sed -i -E "s|^ExecStart=/usr/local/bin/containerd|ExecStart={{ .Target }}/bin/containerd|" "${prefix}/etc/systemd/system/containerd.service.go-template"
sed -i -E "s|^ExecStart=/usr/local/bin/containerd|ExecStart=/{{ .Target }}/bin/containerd|" "${prefix}/etc/systemd/system/containerd.service.go-template"
EOF
RUN <<EOF
curl --silent --show-error --location --fail --output "${prefix}/share/man/man8/containerd-config.8.md" \
Expand Down
2 changes: 1 addition & 1 deletion tools/ct_server/ct_server.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ StartLimitIntervalSec=600
StartLimitBurst=5

[Service]
ExecStart={{ .Target }}/bin/ct_server -logtostderr -log_config /etc/ctfe-config/ct.cfg -log_rpc_server localhost:8091 -http_endpoint 0.0.0.0:6105
ExecStart=/{{ .Target }}/bin/ct_server -logtostderr -log_config /etc/ctfe-config/ct.cfg -log_rpc_server localhost:8091 -http_endpoint 0.0.0.0:6105
Restart=on-failure
RestartSec=5s

Expand Down
12 changes: 6 additions & 6 deletions tools/docker-compose-systemd/docker-compose@.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Type=simple
TimeoutStartSec=15min
Restart=always

ExecStartPre={{ .Target }}/docker compose pull --quiet --ignore-pull-failures
ExecStartPre={{ .Target }}/docker compose build --pull
ExecStartPre=/{{ .Target }}/docker compose pull --quiet --ignore-pull-failures
ExecStartPre=/{{ .Target }}/docker compose build --pull

ExecStart={{ .Target }}/docker compose up --remove-orphans
ExecStart=/{{ .Target }}/docker compose up --remove-orphans

ExecStop={{ .Target }}/docker compose down --remove-orphans
ExecStop=/{{ .Target }}/docker compose down --remove-orphans

ExecReload={{ .Target }}/docker compose pull --quiet --ignore-pull-failures
ExecReload={{ .Target }}/docker compose build --pull
ExecReload=/{{ .Target }}/docker compose pull --quiet --ignore-pull-failures
ExecReload=/{{ .Target }}/docker compose build --pull

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion tools/docker-rootless/docker.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Documentation=https://docs.docker.com/go/rootless/

[Service]
Environment=XDG_RUNTIME_DIR=%h/.cache/dockerd-rootless
ExecStart={{ .Target }}/bin/dockerd-rootless.sh
ExecStart=%h/{{ .Target }}/bin/dockerd-rootless.sh
ExecReload=/bin/kill -s HUP $MAINPID
TimeoutSec=0
RestartSec=2
Expand Down
2 changes: 1 addition & 1 deletion tools/fuse-overlayfs-snapshotter/fuse-overlayfs-snapshotter.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description=containerd-fuse-overlayfs
PartOf=containerd

[Service]
ExecStart={{ .Target }}/bin/containerd-fuse-overlayfs-grpc "/var/run/containerd-fuse-overlayfs.sock" "/var/lib/containerd-fuse-overlayfs"
ExecStart=/{{ .Target }}/bin/containerd-fuse-overlayfs-grpc "/var/run/containerd-fuse-overlayfs.sock" "/var/lib/containerd-fuse-overlayfs"
ExecReload=/bin/kill -s HUP \$MAINPID
RestartSec=2
Restart=always
Expand Down
2 changes: 1 addition & 1 deletion tools/gitlab-runner/gitlab-runner.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ After=syslog.target network.target
[Service]
StartLimitInterval=5
StartLimitBurst=10
ExecStart={{ .Target }}/bin/gitlab-runner "run" "--working-directory" "/home/gitlab-runner" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "gitlab-runner"
ExecStart=/{{ .Target }}/bin/gitlab-runner "run" "--working-directory" "/home/gitlab-runner" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "gitlab-runner"
Restart=always
RestartSec=120
EnvironmentFile=-/etc/sysconfig/gitlab-runner
Expand Down
1 change: 1 addition & 0 deletions tools/goblin/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ go build -o "${prefix}/bin/goblin-api" ./cmd/goblin-api
EOF
RUN <<EOF
cd www
sed -i 's@https://github.com/tailwindlabs/tailwindcss/releases/latest/download/@https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.17/@' Makefile
make installLinux
make build
EOF
Expand Down
4 changes: 2 additions & 2 deletions tools/goblin/goblin.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Description=Golang binaries compiled on-demand for your system
After=network-online.target

[Service]
WorkingDirectory={{ .Target }}/share/goblin
WorkingDirectory=/{{ .Target }}/share/goblin
Type=simple
Restart=always
ExecStart={{ .Target }}/bin/goblin-api
ExecStart=/{{ .Target }}/bin/goblin-api

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion tools/k3s/k3s.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ Restart=always
RestartSec=5s
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
ExecStart={{ .Target }}/bin/k3s
ExecStart=/{{ .Target }}/bin/k3s
4 changes: 2 additions & 2 deletions tools/kind/kind.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ After=docker.service
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart={{ .Target }}/kind create cluster --config /etc/kind/config.yaml
ExecStop={{ .Target }}/kind delete cluster --config /etc/kind/config.yaml
ExecStart=/{{ .Target }}/kind create cluster --config /etc/kind/config.yaml
ExecStop=/{{ .Target }}/kind delete cluster --config /etc/kind/config.yaml

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion tools/kubeadm/kubelet.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
# KUBELET_EXTRA_ARGS should be sourced from this file.
EnvironmentFile=-/etc/default/kubelet
ExecStart=
ExecStart={{ .Target }}/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
ExecStart=/{{ .Target }}/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
2 changes: 1 addition & 1 deletion tools/kubelet/kubelet.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Wants=network-online.target
After=network-online.target

[Service]
ExecStart={{ .Target }}/bin/kubelet
ExecStart=/{{ .Target }}/bin/kubelet
Restart=always
StartLimitInterval=0
RestartSec=10
Expand Down
2 changes: 1 addition & 1 deletion tools/kubo/ipfs.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PartOf=containerd

[Service]
Environment=IPFS_PATH=/var/lib/ipfs
ExecStart={{ .Target }}/bin/ipfs daemon $@
ExecStart=/{{ .Target }}/bin/ipfs daemon $@
ExecReload=/bin/kill -s HUP \$MAINPID
RestartSec=2
Restart=always
Expand Down
2 changes: 1 addition & 1 deletion tools/portainer/portainer.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Documentation=https://www.portainer.io/
After=network.target local-fs.target

[Service]
ExecStart={{ .Target }}/bin/portainer --assets={{ .Target }}/share/portainer --data={{ .Target }}/lib/portainer --bind=127.0.0.1:9000 --bind-https=127.0.0.1:9443 --tunnel-addr=127.0.0.1
ExecStart=/{{ .Target }}/bin/portainer --assets=/{{ .Target }}/share/portainer --data=/{{ .Target }}/lib/portainer --bind=127.0.0.1:9000 --bind-https=127.0.0.1:9443 --tunnel-addr=127.0.0.1

Type=exec
Delegate=yes
Expand Down
2 changes: 1 addition & 1 deletion tools/rekor/rekor.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ StartLimitIntervalSec=600
StartLimitBurst=5

[Service]
ExecStart={{ .Target }}/bin/rekor-server serve --rekor_server.address=0.0.0.0 --trillian_log_server.port=8091
ExecStart=/{{ .Target }}/bin/rekor-server serve --rekor_server.address=0.0.0.0 --trillian_log_server.port=8091
Restart=on-failure
RestartSec=5s

Expand Down
2 changes: 1 addition & 1 deletion tools/stargz-snapshotter/stargz-snapshotter.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PartOf=containerd

[Service]
Environment=IPFS_PATH=${XDG_DATA_HOME}/ipfs
ExecStart={{ .Target }}/bin/containerd-stargz-grpc -address "${XDG_RUNTIME_DIR}/containerd-stargz-grpc/containerd-stargz-grpc.sock" -root "${XDG_DATA_HOME}/containerd-stargz-grpc" -config "${XDG_CONFIG_HOME}/containerd-stargz-grpc/config.toml"
ExecStart=/{{ .Target }}/bin/containerd-stargz-grpc -address "${XDG_RUNTIME_DIR}/containerd-stargz-grpc/containerd-stargz-grpc.sock" -root "${XDG_DATA_HOME}/containerd-stargz-grpc" -config "${XDG_CONFIG_HOME}/containerd-stargz-grpc/config.toml"
ExecReload=/bin/kill -s HUP \$MAINPID
RestartSec=2
Restart=always
Expand Down
2 changes: 1 addition & 1 deletion tools/trillian/trillian_log_server.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ StartLimitIntervalSec=600
StartLimitBurst=5

[Service]
ExecStart={{ .Target }}/bin/trillian_log_server -http_endpoint=localhost:8090 -rpc_endpoint=localhost:8091 --logtostderr ...
ExecStart=/{{ .Target }}/bin/trillian_log_server -http_endpoint=localhost:8090 -rpc_endpoint=localhost:8091 --logtostderr ...
Restart=on-failure
RestartSec=5s

Expand Down
2 changes: 1 addition & 1 deletion tools/trillian/trillian_log_signer.service.go-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ StartLimitIntervalSec=600
StartLimitBurst=5

[Service]
ExecStart={{ .Target }}/bin/trillian_log_signer --logtostderr --force_master --http_endpoint=localhost:8190 -rpc_endpoint=localhost:8191 --batch_size=1000 --sequencer_guard_window=0 --sequencer_interval=200ms
ExecStart=/{{ .Target }}/bin/trillian_log_signer --logtostderr --force_master --http_endpoint=localhost:8190 -rpc_endpoint=localhost:8191 --batch_size=1000 --sequencer_guard_window=0 --sequencer_interval=200ms
Restart=on-failure
RestartSec=5s

Expand Down