Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit 1c420d2

Browse files
committed
First step towards renaming #6716
1 parent 7001829 commit 1c420d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+322
-322
lines changed

.github/workflows/build-base.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525

26-
- name: Install docker-setup
27-
uses: nicholasdille/docker-setup-action@main
26+
- name: Install uniget
27+
uses: uniget-org/uniget-action@main
2828
with:
2929
prefix: helper
3030
tools: gojq regclient

.github/workflows/build-go.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
2929
- name: Smoke test
3030
run: |
31-
./docker-setup --version
31+
./uniget --version

.github/workflows/ghcr-cleanup.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424

25-
- name: Install docker-setup
26-
uses: nicholasdille/docker-setup-action@main
25+
- name: Install uniget
26+
uses: uniget-org/uniget-action@main
2727
with:
2828
prefix: helper
2929

.github/workflows/pages.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
with:
3333
fetch-depth: 0
3434

35-
- name: Install docker-setup
36-
uses: nicholasdille/docker-setup-action@main
35+
- name: Install uniget
36+
uses: uniget-org/uniget-action@main
3737
with:
3838
prefix: helper
3939
tools: hugo regclient gojq

.github/workflows/push.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333

34-
- name: Install docker-setup
35-
uses: nicholasdille/docker-setup-action@main
34+
- name: Install uniget
35+
uses: uniget-org/uniget-action@main
3636
with:
3737
prefix: helper
3838
tools: gojq
@@ -50,7 +50,7 @@ jobs:
5050
helper/usr/local/bin/jq \
5151
--raw-output \
5252
'.revision' \
53-
helper/var/cache/docker-setup/metadata.json
53+
helper/var/cache/uniget/metadata.json
5454
)"
5555
5656
echo "### Fetching changed tools for ${OLD_COMMIT_SHA}..${GITHUB_SHA}"
@@ -96,8 +96,8 @@ jobs:
9696
with:
9797
fetch-depth: 0
9898

99-
- name: Install docker-setup
100-
uses: nicholasdille/docker-setup-action@main
99+
- name: Install uniget
100+
uses: uniget-org/uniget-action@main
101101
with:
102102
prefix: helper
103103
tools: gojq regclient yq
@@ -166,8 +166,8 @@ jobs:
166166
with:
167167
fetch-depth: 0
168168

169-
- name: Install docker-setup
170-
uses: nicholasdille/docker-setup-action@main
169+
- name: Install uniget
170+
uses: uniget-org/uniget-action@main
171171
with:
172172
prefix: helper
173173
tools: gojq regclient yq

.github/workflows/rebuild.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
- name: Checkout code
1717
uses: actions/checkout@v3
1818

19-
- name: Install docker-setup
20-
uses: nicholasdille/docker-setup-action@main
19+
- name: Install uniget
20+
uses: uniget-org/uniget-action@main
2121
with:
2222
prefix: helper
2323
tools: gojq regclient

.github/workflows/release.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
with:
4444
ref: ${{ needs.prepare.outputs.tag }}
4545

46-
- name: Install docker-setup
47-
uses: nicholasdille/docker-setup-action@main
46+
- name: Install uniget
47+
uses: uniget-org/uniget-action@main
4848
with:
4949
prefix: helper
5050
tools: go goreleaser syft
@@ -81,8 +81,8 @@ jobs:
8181
username: nicholasdille
8282
password: ${{ secrets.PACKAGES_TOKEN }}
8383

84-
- name: Install docker-setup
85-
uses: nicholasdille/docker-setup-action@main
84+
- name: Install uniget
85+
uses: uniget-org/uniget-action@main
8686
with:
8787
prefix: helper
8888
tools: gojq regclient yq
@@ -92,16 +92,16 @@ jobs:
9292
- name: Update manifest
9393
run: |
9494
VERSION=${{ needs.prepare.outputs.version }} \
95-
helper/usr/local/bin/yq eval --inplace '.version = env(VERSION)' tools/docker-setup/manifest.yaml
95+
helper/usr/local/bin/yq eval --inplace '.version = env(VERSION)' tools/uniget/manifest.yaml
9696
9797
- name: Build and push
9898
run: |
99-
make docker-setup--push metadata.json--push
99+
make uniget--push metadata.json--push
100100
101101
- name: Commit updated manifest
102102
uses: stefanzweifel/git-auto-commit-action@v4
103103
with:
104104
branch: main
105105
create_branch: false
106-
file_pattern: tools/docker-setup/manifest.yaml
107-
commit_message: "Version bump for docker-setup"
106+
file_pattern: tools/uniget/manifest.yaml
107+
commit_message: "Version bump for uniget"

.github/workflows/test-linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
- name: Checkout code
2222
uses: actions/checkout@v3
2323

24-
- name: Install docker-setup
25-
uses: nicholasdille/docker-setup-action@main
24+
- name: Install uniget
25+
uses: uniget-org/uniget-action@main
2626
with:
2727
prefix: helper
2828
tools: gojq regclient

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata.json
55
cosign.key
66
/@base/build.log
77
/@metadata/build.log
8-
/docker-setup
8+
/uniget
99
coverage.*
1010
dist/
1111
.task

.goreleaser.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
2-
project_name: docker-setup
2+
project_name: uniget
33

44
builds:
5-
- main: ./cmd/docker-setup
6-
binary: docker-setup
5+
- main: ./cmd/uniget
6+
binary: uniget
77
gobinary: helper/usr/local/bin/go
88
env:
99
- CGO_ENABLED=0
@@ -29,7 +29,7 @@ sboms:
2929
- ${artifact}.cyclonedx.json
3030

3131
archives:
32-
- id: docker-setup
32+
- id: uniget
3333
format: tar.gz
3434
name_template: >-
3535
{{ .ProjectName }}_
@@ -47,8 +47,8 @@ changelog:
4747
release:
4848
github:
4949
owner: nicholasdille
50-
name: docker-setup
50+
name: uniget
5151
ids:
52-
- docker-setup
52+
- uniget
5353
name_template: "{{ .Version }}"
5454
mode: replace

@base/Dockerfile

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
FROM nicholasdille/ubuntu:22.04 AS base
44

5-
ARG prefix_override=/docker_setup_install
5+
ARG prefix_override=/bootstrap
66
ARG target_override=/usr/local
7-
ENV docker_setup_cache=/var/cache/docker-setup \
8-
docker_setup_contrib=/var/lib/docker-setup/contrib \
9-
docker_setup_manifests=/var/lib/docker-setup/manifests \
10-
docker_setup_post_install=/var/lib/docker-setup/post_install \
7+
ENV uniget_cache=/var/cache/uniget \
8+
uniget_contrib=/var/lib/uniget/contrib \
9+
uniget_manifests=/var/lib/uniget/manifests \
10+
uniget_post_install=/var/lib/uniget/post_install \
1111
prefix=${prefix_override} \
1212
target=${target_override}
1313
ARG TARGETPLATFORM
@@ -32,10 +32,10 @@ EOF
3232
SHELL [ "bash", "-clo", "errexit"]
3333
RUN <<EOF
3434
mkdir -p \
35-
"${prefix}${docker_setup_cache}" \
36-
"${prefix}${docker_setup_contrib}" \
37-
"${prefix}${docker_setup_manifests}" \
38-
"${prefix}${docker_setup_post_install}" \
35+
"${prefix}${uniget_cache}" \
36+
"${prefix}${uniget_contrib}" \
37+
"${prefix}${uniget_manifests}" \
38+
"${prefix}${uniget_post_install}" \
3939
"${prefix}${target}/etc/profile.d" \
4040
"${prefix}${target}/etc/systemd/system" \
4141
"${prefix}${target}/bin" \
@@ -60,7 +60,7 @@ mkdir -p \
6060
"${prefix}${target}/share/zsh/vendor-completions"
6161
EOF
6262

63-
LABEL org.opencontainers.image.source="https://github.com/nicholasdille/docker-setup" \
63+
LABEL org.opencontainers.image.source="https://github.com/uniget-org/uniget" \
6464
org.opencontainers.image.ref.name="main" \
6565
org.opencontainers.image.description="Base image for building tools images" \
6666
org.opencontainers.image.version="main"

@metadata/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ COPY metadata.json /
33

44
ARG ref=main
55
ARG commit=UNKNOWN
6-
LABEL org.opencontainers.image.source="https://github.com/nicholasdille/docker-setup" \
6+
LABEL org.opencontainers.image.source="https://github.com/uniget-org/uniget" \
77
org.opencontainers.image.ref.name="${ref}" \
88
org.opencontainers.image.title="Metadata" \
99
org.opencontainers.image.description="Metadata about published tools" \

Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
1010
FROM base AS build
1111
ARG TARGETOS
1212
ARG TARGETARCH
13-
WORKDIR /go/src/github.com/nicholasdille/docker-setup
13+
WORKDIR /go/src/github.com/uniget-org/uniget
1414
ARG version=main
1515
ENV CGO_ENABLED=0
1616
RUN --mount=target=. \
@@ -22,8 +22,8 @@ GOARCH=${TARGETARCH} \
2222
go build \
2323
-buildvcs=false \
2424
-ldflags "-w -s -X main.version=${version}" \
25-
-o /out/docker-setup \
26-
./cmd/docker-setup
25+
-o /out/uniget \
26+
./cmd/uniget
2727
EOF
2828

2929
FROM base AS unit-test
@@ -52,12 +52,12 @@ FROM scratch AS unit-test-coverage
5252
COPY --from=unit-test /out/cover.out /cover.out
5353

5454
FROM scratch AS bin-unix
55-
COPY --from=build /out/docker-setup /
55+
COPY --from=build /out/uniget /
5656

5757
FROM bin-unix AS bin-linux
5858
FROM bin-unix AS bin-darwin
5959

6060
FROM scratch AS bin-windows
61-
COPY --from=build /out/docker-setup /docker-setup.exe
61+
COPY --from=build /out/uniget /uniget.exe
6262

6363
FROM bin-${TARGETOS} as bin

Makefile

+4-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ ALL_TOOLS = $(shell find tools -type f -wholename \*/manifest.yaml | c
1010
ALL_TOOLS_RAW = $(subst tools/,,$(ALL_TOOLS))
1111
TOOLS ?= $(shell find tools -type f -wholename \*/manifest.yaml | cut -d/ -f1-2 | sort)
1212
TOOLS_RAW ?= $(subst tools/,,$(TOOLS))
13-
PREFIX ?= /docker_setup_install
13+
PREFIX ?= /bootstrap
1414
TARGET ?= /usr/local
1515

1616
# Pre-defined colors: https://github.com/moby/buildkit/blob/master/util/progress/progressui/colors.go
1717
BUILDKIT_COLORS ?= run=light-blue:warning=yellow:error=red:cancel=255,165,0
1818
NO_COLOR ?= ""
1919

20-
OWNER ?= nicholasdille
21-
PROJECT ?= docker-setup
20+
OWNER ?= uniget-org
21+
PROJECT ?= uniget
2222
REGISTRY ?= ghcr.io
2323
REPOSITORY_PREFIX ?= $(OWNER)/$(PROJECT)/
2424

@@ -90,7 +90,6 @@ help:
9090
@echo " <tool>--show Display directory contents"
9191
@echo
9292
@echo "Building:"
93-
@echo " check Run shellcheck on docker-setup"
9493
@echo " tools/<tool>/Dockerfile Generate from tools/*/Dockerfile.template"
9594
@echo " base Build base container image for all tool installations"
9695
@echo " <tool> Build container image for specific tool"
@@ -129,7 +128,7 @@ help:
129128
@echo " recent-days--<N> Show tools changed in the last <N> days"
130129
@echo
131130
@echo "Helper tools:"
132-
@echo " $(HELPER)/var/lib/docker-setup/manifests/<tool>.json"
131+
@echo " $(HELPER)/var/lib/uniget/manifests/<tool>.json"
133132
@echo " Install specified tool to helper/"
134133
@echo
135134
@echo "GHCR:"

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker-setup
1+
# uniget
22

33
```plaintext
44
_ _ _
@@ -13,19 +13,19 @@ The container tools installer and updater
1313

1414
## Purpose
1515

16-
`docker-setup` is inspired by the [convenience script](https://docs.docker.com/engine/install/ubuntu/#install-using-the-convenience-script) to install the Docker daemon. But the scope is much larger.
16+
`uniget` is inspired by the [convenience script](https://docs.docker.com/engine/install/ubuntu/#install-using-the-convenience-script) to install the Docker daemon. But the scope is much larger.
1717

18-
`docker-setup` is meant to bootstrap a new box with Docker as well as install useful tools from the container ecosystem and beyond. It can also be used to update these tools. It aims to be distribution-agnostic and provide reasonable default configurations. Personally, I am using it to prepare virtual machines for my own experiments as well as training environments.
18+
`uniget` is meant to bootstrap a new box with Docker as well as install useful tools from the container ecosystem and beyond. It can also be used to update these tools. It aims to be distribution-agnostic and provide reasonable default configurations. Personally, I am using it to prepare virtual machines for my own experiments as well as training environments.
1919

2020
Tools are downloaded, installed and updated automatically.
2121

2222
## Quickstart
2323

24-
Download and run `docker-setup`:
24+
Download and run `uniget`:
2525

2626
```bash
27-
curl -sLf https://github.com/nicholasdille/docker-setup/releases/latest/download/docker-setup_linux_$(uname -m).tar.gz | \
28-
sudo tar -xzC /usr/local/bin docker-setup
27+
curl -sLf https://github.com/uniget-org/uniget/releases/latest/download/uniget_linux_$(uname -m).tar.gz | \
28+
sudo tar -xzC /usr/local/bin uniget
2929
```
3030

3131
## Documentation

Taskfile.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tasks:
1818
cmds:
1919
- task: prompt
2020
- docker image rm -f {{.IMAGE_NAME}}
21-
- rm docker-setup
21+
- rm uniget
2222

2323
image:
2424
desc: Build container image
@@ -43,6 +43,6 @@ tasks:
4343
- Dockerfile
4444
- docker-bake.hcl
4545
generates:
46-
- docker-setup
46+
- uniget
4747
cmds:
4848
- docker buildx bake binary

0 commit comments

Comments
 (0)