Skip to content

Commit 43b61e3

Browse files
sschmidsschmid
committed
Rename Docker* to Container*
1 parent 9244d7e commit 43b61e3

File tree

10 files changed

+29
-29
lines changed

10 files changed

+29
-29
lines changed

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ Run tests in parallel:
5454
test/run -j 4
5555
```
5656

57-
Run tests in a container (Docker, Podman):
58-
- see [Dockerfiles](docker)
57+
Run tests in a container (Podman, Docker, Apple container):
58+
- see [Containerfiles](container)
5959

6060
```bash
6161
test/run -p alpine
6262
```
6363

6464
Run tests in all containers:
65-
- see [Dockerfiles](docker)
65+
- see [Containerfiles](container)
6666

6767
```bash
6868
test/run -a

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ Alternatively, you can use `pw` directly from the `src` directory.
6666
~/Downloads/pw/src/pw
6767
```
6868

69-
| | Tested on the following platforms: | |
70-
|---------------------------------------------------------------------------------------------|------------------------------------|-----------------------------------------------------|
71-
| <img src="https://upload.wikimedia.org/wikipedia/commons/3/3a/MacOS_logo2.svg" height="48"> | macOS | |
72-
| <img src="https://flatpak.org/img/distro/alpine-97c47415.svg" height="48"> | Alpine Linux | [Dockerfile](docker/alpine/Dockerfile) |
73-
| <img src="https://flatpak.org/img/distro/arch-61d364d6.svg" height="48"> | Arch Linux | [Dockerfile](docker/archlinux/Dockerfile) |
74-
| <img src="https://flatpak.org/img/distro/debian-03035138.svg" height="48"> | Debian | [Dockerfile](docker/debian/Dockerfile) |
75-
| <img src="https://flatpak.org/img/distro/fedora-e2366c83.svg" height="48"> | Fedora | [Dockerfile](docker/fedora/Dockerfile) |
76-
| <img src="https://flatpak.org/img/distro/opensuse-6686fd27.svg" height="48"> | openSUSE Tumbleweed | [Dockerfile](docker/opensuse-tumbleweed/Dockerfile) |
77-
| <img src="https://flatpak.org/img/distro/ubuntu-d865890b.svg" height="48"> | Ubuntu | [Dockerfile](docker/ubuntu/Dockerfile) |
69+
| | Tested on the following platforms: | |
70+
|---------------------------------------------------------------------------------------------|------------------------------------|--------------------------------------------------------------|
71+
| <img src="https://upload.wikimedia.org/wikipedia/commons/3/3a/MacOS_logo2.svg" height="48"> | macOS | |
72+
| <img src="https://flatpak.org/img/distro/alpine-97c47415.svg" height="48"> | Alpine Linux | [Containerfile](container/alpine/Containerfile) |
73+
| <img src="https://flatpak.org/img/distro/arch-61d364d6.svg" height="48"> | Arch Linux | [Containerfile](container/archlinux/Containerfile) |
74+
| <img src="https://flatpak.org/img/distro/debian-03035138.svg" height="48"> | Debian | [Containerfile](container/debian/Containerfile) |
75+
| <img src="https://flatpak.org/img/distro/fedora-e2366c83.svg" height="48"> | Fedora | [Containerfile](container/fedora/Containerfile) |
76+
| <img src="https://flatpak.org/img/distro/opensuse-6686fd27.svg" height="48"> | openSUSE Tumbleweed | [Containerfile](container/opensuse-tumbleweed/Containerfile) |
77+
| <img src="https://flatpak.org/img/distro/ubuntu-d865890b.svg" height="48"> | Ubuntu | [Containerfile](container/ubuntu/Containerfile) |
7878

7979
# Quickstart
8080

docker/alpine/Dockerfile renamed to container/alpine/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ COPY plugins plugins
1515
COPY version.txt .
1616
RUN ln -s /opt/pw/src/pw /usr/local/bin/pw
1717
WORKDIR /root
18-
COPY docker/docker-entrypoint.sh /usr/local/bin/
19-
ENTRYPOINT ["docker-entrypoint.sh"]
18+
COPY container/entrypoint.sh /usr/local/bin/
19+
ENTRYPOINT ["entrypoint.sh"]
2020

2121
FROM pw AS test
2222
WORKDIR /opt/pw

docker/archlinux/Dockerfile renamed to container/archlinux/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ COPY plugins plugins
1717
COPY version.txt .
1818
RUN ln -s /opt/pw/src/pw /usr/local/bin/pw
1919
WORKDIR /root
20-
COPY docker/docker-entrypoint.sh /usr/local/bin/
21-
ENTRYPOINT ["docker-entrypoint.sh"]
20+
COPY container/entrypoint.sh /usr/local/bin/
21+
ENTRYPOINT ["entrypoint.sh"]
2222

2323
FROM pw AS test
2424
WORKDIR /opt/pw

docker/debian/Dockerfile renamed to container/debian/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ COPY plugins plugins
1717
COPY version.txt .
1818
RUN ln -s /opt/pw/src/pw /usr/local/bin/pw
1919
WORKDIR /root
20-
COPY docker/docker-entrypoint.sh /usr/local/bin/
21-
ENTRYPOINT ["docker-entrypoint.sh"]
20+
COPY container/entrypoint.sh /usr/local/bin/
21+
ENTRYPOINT ["entrypoint.sh"]
2222

2323
FROM pw AS test
2424
WORKDIR /opt/pw

docker/docker-entrypoint.sh renamed to container/entrypoint.sh

File renamed without changes.

docker/fedora/Dockerfile renamed to container/fedora/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ COPY plugins plugins
2020
COPY version.txt .
2121
RUN ln -s /opt/pw/src/pw /usr/local/bin/pw
2222
WORKDIR /root
23-
COPY docker/docker-entrypoint.sh /usr/local/bin/
24-
ENTRYPOINT ["docker-entrypoint.sh"]
23+
COPY container/entrypoint.sh /usr/local/bin/
24+
ENTRYPOINT ["entrypoint.sh"]
2525

2626
FROM pw AS test
2727
WORKDIR /opt/pw

docker/opensuse-tumbleweed/Dockerfile renamed to container/opensuse-tumbleweed/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ COPY plugins plugins
1919
COPY version.txt .
2020
RUN ln -s /opt/pw/src/pw /usr/local/bin/pw
2121
WORKDIR /root
22-
COPY docker/docker-entrypoint.sh /usr/local/bin/
23-
ENTRYPOINT ["docker-entrypoint.sh"]
22+
COPY container/entrypoint.sh /usr/local/bin/
23+
ENTRYPOINT ["entrypoint.sh"]
2424

2525
FROM pw AS test
2626
WORKDIR /opt/pw

docker/ubuntu/Dockerfile renamed to container/ubuntu/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ COPY plugins plugins
1717
COPY version.txt .
1818
RUN ln -s /opt/pw/src/pw /usr/local/bin/pw
1919
WORKDIR /root
20-
COPY docker/docker-entrypoint.sh /usr/local/bin/
21-
ENTRYPOINT ["docker-entrypoint.sh"]
20+
COPY container/entrypoint.sh /usr/local/bin/
21+
ENTRYPOINT ["entrypoint.sh"]
2222

2323
FROM pw AS test
2424
WORKDIR /opt/pw

‎test/run‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ set -e
33
[[ ! -f test/bats/bin/bats ]] && git submodule update --init --recursive
44

55
_container_cmd() {
6-
if command -v docker &>/dev/null; then
7-
docker "$@"
8-
elif command -v podman &>/dev/null; then
6+
if command -v podman &>/dev/null; then
97
podman "$@"
8+
elif command -v docker &>/dev/null; then
9+
docker "$@"
1010
elif command -v container &>/dev/null; then
1111
container system start
1212
container "$@"
1313
else
14-
echo "Error: No container runtime found. Please install either Docker or Podman and ensure it's available in your PATH." >&2
14+
echo "Error: No container runtime found. Please install Podman, Docker or Apple container and ensure it's available in your PATH." >&2
1515
exit 1
1616
fi
1717
}
1818

1919
run_tests() {
20-
DOCKER_BUILDKIT=1 _container_cmd build --target test -t "sschmid/pw/test/$1" -f "docker/$1/Dockerfile" .
20+
DOCKER_BUILDKIT=1 _container_cmd build --target test -t "sschmid/pw/test/$1" -f "container/$1/Containerfile" .
2121
}
2222

2323
cmd_options=()

0 commit comments

Comments
 (0)