Skip to content

[CIVIS-9315] Fix apt-get and update AWS CLI#97

Merged
mheilman merged 7 commits into
masterfrom
CIVIS-9315-fix-apt
Aug 26, 2024
Merged

[CIVIS-9315] Fix apt-get and update AWS CLI#97
mheilman merged 7 commits into
masterfrom
CIVIS-9315-fix-apt

Conversation

@mheilman

@mheilman mheilman commented Aug 26, 2024

Copy link
Copy Markdown
Contributor

This fixes apt-get by updating the base image.

Also:

Here's a test job in Platform.


  • (For Civis employees only) Reference to a relevant ticket in the pull request title
  • Changelog entry added to CHANGELOG.md at the repo's root level
  • Description of change in the pull request description
  • If applicable, unit tests have been added and/or updated
  • The CircleCI builds have all passed

@mheilman mheilman self-assigned this Aug 26, 2024
@mheilman mheilman force-pushed the CIVIS-9315-fix-apt branch from dd00ad1 to 3242c2e Compare August 26, 2024 15:31
@mheilman mheilman force-pushed the CIVIS-9315-fix-apt branch from 3242c2e to 2e95c6f Compare August 26, 2024 17:32
@mheilman mheilman force-pushed the CIVIS-9315-fix-apt branch from 2e95c6f to 23e594e Compare August 26, 2024 17:36
Comment thread Dockerfile
@@ -1,6 +1,13 @@
FROM python:3.12.4-slim AS production
ARG PLATFORM=linux/x86_64
ARG BASE_IMAGE=python:3.12.5-slim

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just moving from python:3.12.4-slim to python:3.12.5-slim fixed the issue with running apt-get in FIPS-mode. Apparently, python:3.12.4-slim was last built before the issue was fixed.

Comment thread Dockerfile
curl && \
curl \
mandoc # For AWS CLI help \
unzip && \

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unzip is needed for the aws CLI, but it seems generally useful and isn't a big dependency.

Comment thread buildspec/push.yaml
@@ -0,0 +1,19 @@
version: 0.2

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this to make things easier to test.

@mheilman mheilman changed the title [CIVIS-9315] Fix apt-get [CIVIS-9315] Fix apt-get and update AWS CLI Aug 26, 2024
@mheilman mheilman force-pushed the CIVIS-9315-fix-apt branch from b239191 to 3e69465 Compare August 26, 2024 18:07
@mheilman mheilman marked this pull request as ready for review August 26, 2024 18:09
@mheilman mheilman force-pushed the CIVIS-9315-fix-apt branch from 3e69465 to 01e5f4f Compare August 26, 2024 18:24
@mheilman mheilman removed their assignment Aug 26, 2024

@jacksonlee-civis jacksonlee-civis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mheilman mheilman merged commit c6a15dd into master Aug 26, 2024
@civis-robot

Copy link
Copy Markdown

Pull Request Merged!!! This build is running now.

@mheilman mheilman deleted the CIVIS-9315-fix-apt branch August 26, 2024 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants