Skip to content

fix: reverts "fix: install openrc service on alpine (#12294)" #13178

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
merged 1 commit into from
May 6, 2024
Merged

fix: reverts "fix: install openrc service on alpine (#12294)" #13178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 0 additions & 38 deletions scripts/linux-pkg/coder-openrc
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions scripts/linux-pkg/coder-workspace-proxy-openrc
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions scripts/linux-pkg/nfpm-alpine.yaml
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions scripts/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,9 @@ ln "$(realpath scripts/linux-pkg/nfpm.yaml)" "$temp_dir/"
ln "$(realpath scripts/linux-pkg/nfpm-alpine.yaml)" "$temp_dir/"
ln "$(realpath scripts/linux-pkg/preinstall.sh)" "$temp_dir/"

nfpm_config_file="nfpm.yaml"

# Use nfpm-alpine.yaml when building for Alpine (OpenRC).
if [[ "$format" == "apk" ]]; then
nfpm_config_file="nfpm-alpine.yaml"
fi

pushd "$temp_dir"
GOARCH="$arch" CODER_VERSION="$version" nfpm package \
-f "$nfpm_config_file" \
-f nfpm.yaml \
-p "$format" \
-t "$output_path" \
1>&2
Expand Down