Skip to content

Commit

Permalink
Merge pull request #94 from stewartsmith/al2023
Browse files Browse the repository at this point in the history
  • Loading branch information
travier authored Aug 22, 2023
2 parents 191fbbc + eb1e69d commit 283060c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/amazonlinux-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ on:
env:
distro: 'amazonlinux'
distro_pretty: 'Amazon Linux'
latest_release: '2022'
latest_release: '2023'

jobs:
build-images:
strategy:
matrix:
release: ['2', '2022']
release: ['2', '2023']

runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/amazonlinux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ concurrency: ${{ github.workflow }}
env:
distro: 'amazonlinux'
distro_pretty: 'Amazon Linux'
latest_release: '2022'
latest_release: '2023'

jobs:
build-and-push-images:
strategy:
matrix:
release: ['2', '2022']
release: ['2', '2023']

runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ directly use the commands below:

- [Amazon Linux] Note: Only Amazon Linux 2 comes with [EPEL] enabled by default:
```
$ toolbox create --image quay.io/toolbx-images/amazonlinux-toolbox:2023
$ toolbox enter amazonlinux-toolbox-2023
$ toolbox create --image quay.io/toolbx-images/amazonlinux-toolbox:2
$ toolbox enter amazonlinux-toolbox-2
$ toolbox create --image quay.io/toolbx-images/amazonlinux-toolbox:2022
$ toolbox enter amazonlinux-toolbox-2022
```

- [Arch Linux]:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM public.ecr.aws/amazonlinux/amazonlinux:2022
FROM public.ecr.aws/amazonlinux/amazonlinux:2023

LABEL com.github.containers.toolbox="true" \
name="amazonlinux-toolbox" \
version="2022" \
version="2023" \
usage="This image is meant to be used with the toolbox command" \
summary="Base image for creating Amazon Linux toolbx 2022 containers" \
maintainer="Adam Kaminski <adam@adamkaminski.com>"
summary="Base image for creating Amazon Linux 2023 toolbox containers" \
maintainer="Stewart Smith <trawets@amazon.com>"

COPY missing-docs extra-packages /

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 283060c

Please sign in to comment.