-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Bicaws-3025: Add amazon linux 2023 image #252
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
9a81aa0
add amazon linux 2023 image
ian-antking 1e7af63
Merge branch 'main' into bicaws-3025
ian-antking c627914
Merge branch 'main' into bicaws-3025
ian-antking f048b91
update CircleCI machine image
ian-antking 5406007
change yum command to dnf
ian-antking 1bfd957
change user uid/gid
ian-antking 2301ddd
change expected /etc/passwd size
ian-antking e233535
add python and python2-pip to packages installed via dnf
ian-antking 1cc0412
add changes from main amazon linux base image
ian-antking abe064a
remove package assertions
ian-antking 28d2035
switch nodejs image to amazonlinux:2023 base
ian-antking 6bdc3d7
install dirmngr
ian-antking 945f906
switch off layer caching
ian-antking 4cca02b
Revert "switch off layer caching"
ian-antking a2d16b1
revert nodejs to amazon linux 2
ian-antking 9231d84
update /etc/passwd size
ian-antking a2bf5a4
Merge branch 'main' into bicaws-3025
ian-antking File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
ARG BUILD_IMAGE="amazonlinux:2023" | ||
|
||
FROM ${BUILD_IMAGE} | ||
|
||
LABEL maintainer="CJSE" | ||
ARG DNF_PACKAGES="pip gzip tar unzip openssl shadow-utils xz wget gnupg dirmngr" | ||
|
||
RUN dnf update -y &&\ | ||
dnf install -y ${DNF_PACKAGES} --allowerasing | ||
|
||
# https://github.com/aws/aws-cli/issues/8036 | ||
RUN pip install wheel &&\ | ||
pip install "Cython<3.0" "pyyaml<6" --no-build-isolation | ||
|
||
RUN rm -rf /var/log/* &&\ | ||
dnf clean all &&\ | ||
rm -rf /var/cache/dnf | ||
|
||
CMD ["tail", "-f", "/dev/null"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
SHELL := /bin/bash # Use bash syntax | ||
.PHONY: build | ||
|
||
build: | ||
bash build.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/bash | ||
|
||
set -e | ||
|
||
IMAGE="amazon-linux2023-base" | ||
|
||
docker build -t "${IMAGE}" . | ||
|
||
if [ "$SKIP_GOSS" = "true" ]; then | ||
echo "Skipping dgoss tests" | ||
else | ||
GOSS_SLEEP=15 dgoss run $IMAGE | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- | ||
|
||
version: 0.2 | ||
phases: | ||
build: | ||
commands: | ||
- set -ev | ||
- cd ./Amazon_Linux_2023_Base | ||
- /bin/bash ./scripts/build_docker.sh | ||
|
||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
file: | ||
/etc/passwd: | ||
exists: true | ||
mode: "0644" | ||
size: 839 | ||
owner: root | ||
group: root | ||
filetype: file | ||
contains: [] | ||
user: | ||
nobody: | ||
exists: true | ||
uid: 65534 | ||
gid: 65534 | ||
groups: | ||
- nobody | ||
home: / | ||
shell: /sbin/nologin |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
#!/usr/bin/env bash | ||
|
||
set -e | ||
|
||
export readonly REPOSITORY_NAME="amazon-linux2023-base" | ||
export readonly SOURCE_REPOSITORY_NAME="amazon-linux-2023" | ||
|
||
/bin/bash ../scripts/build_and_push_image.sh | ||
|
||
aws codebuild start-build --project-name "build-openjdk-jre11-slim-docker" \ | ||
--environment-variables-override name=DOCKER_IMAGE_HASH,value="${DOCKER_IMAGE_PREFIX}@${SHA_HASH}",type=PLAINTEXT | ||
|
||
aws codebuild start-build --project-name "build-nodejs-16-docker" \ | ||
--environment-variables-override name=DOCKER_IMAGE_HASH,value="${DOCKER_IMAGE_PREFIX}@${SHA_HASH}",type=PLAINTEXT | ||
|
||
aws codebuild start-build --project-name "build-logstash-docker" \ | ||
--environment-variables-override name=DOCKER_IMAGE_HASH,value="${DOCKER_IMAGE_PREFIX}@${SHA_HASH}",type=PLAINTEXT | ||
|
||
aws codebuild start-build --project-name "build-grafana-ssl-docker" | ||
|
||
aws codebuild start-build --project-name "build-grafana-codebuild-ssl-docker" | ||
|
||
aws codebuild start-build --project-name "build-nginx-supervisord-docker" | ||
|
||
aws codebuild start-build --project-name "build-postfix-docker" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably isn't needed - if you look at the issue, it should only affect the previous version of
awscli
.aws/aws-cli#8036 (comment)