Skip to content

Commit

Permalink
archlinux: Rename to arch
Browse files Browse the repository at this point in the history
The os-release(5) ID on Arch Linux is 'arch', not 'archlinux'.  The
convention of naming the Toolbx images according to the os-release(5) ID
is deeply ingrained in the Toolbx code base.  It will be better to keep
things simple by continuing that practice, instead of adding a one-off
exception.  Especially, now that built-in support for Arch Linux will be
added to Toolbx.

#82
  • Loading branch information
debarshiray committed Jun 6, 2023
1 parent 46c26aa commit 3ec3400
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
branches:
- main
paths:
- archlinux/**
- .github/workflows/archlinux-pr.yaml
- arch/**
- .github/workflows/arch-pr.yaml

env:
distro: 'archlinux'
distro: 'arch'
distro_pretty: 'Arch Linux'
jobs:
build-and-push-images:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ on:
branches:
- main
paths:
- archlinux/**
- .github/workflows/archlinux.yaml
- arch/**
- .github/workflows/arch.yaml
schedule:
- cron: '0 0 * * MON'

# Prevent multiple workflow runs from racing
concurrency: ${{ github.workflow }}

env:
distro: 'archlinux'
distro: 'arch'
distro_pretty: 'Arch Linux'
jobs:
build-and-push-images:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ directly use the commands below:

- [Arch Linux]:
```
$ toolbox create --image quay.io/toolbx-images/archlinux-toolbox:latest
$ toolbox enter archlinux-toolbox-latest
$ toolbox create --image quay.io/toolbx-images/arch-toolbox:latest
$ toolbox enter arch-toolbox-latest
```

- [CentOS (Stream)] with [EPEL] enabled by default:
Expand Down
2 changes: 1 addition & 1 deletion archlinux/Containerfile → arch/Containerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM docker.io/library/archlinux:base-devel

LABEL com.github.containers.toolbox="true" \
name="archlinux-toolbox" \
name="arch-toolbox" \
version="base-devel" \
usage="This image is meant to be used with the toolbox command" \
summary="Base image for creating Arch Linux toolbox containers" \
Expand Down
File renamed without changes.

0 comments on commit 3ec3400

Please sign in to comment.