Skip to content

Commit

Permalink
Merge pull request #5 from lsst-dm/tickets/DM-48406
Browse files Browse the repository at this point in the history
DM-48406: Update image to work with aarch64
  • Loading branch information
roceb authored Jan 14, 2025
2 parents 8dc6086 + 039febe commit 06dbbeb
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 6 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Build

on:
pull_request:
push:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: get tag
id: tag
shell: bash
run: |
if [ "$GITHUB_HEAD_REF" == "main" ]; then
echo tag="$(grep AWSCLI_VER Dockerfile | head -n 1 | cut -d'=' -f 2)" >> "${GITHUB_OUTPUT}"
fi
- name: Build and push
uses: lsst-dm/build-and-push@main
id: build
with:
push: true
github_token: ${{ secrets.GITHUB_TOKEN }}
platforms: linux/amd64,linux/arm64
image: ${{ github.repository }}
tag: ${{ steps.tag.outputs.tag}}

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM alpine:3
ARG AWS_DEFAULT_REGION=us-east-1
# This default version is always overridden in the Jenkins context by a value
# from configuration in jenkins-dm-jobs
ARG AWSCLI_VER=1.25.21
ARG AWSCLI_VER=1.36.39

RUN apk add --no-cache --upgrade python3 py3-pip bash && \
pip3 install awscli==${AWSCLI_VER} --upgrade --no-cache-dir && \
pip3 install awscli==${AWSCLI_VER} --upgrade --no-cache-dir --break-system-packages && \
rm -rf /root/.cache
4 changes: 0 additions & 4 deletions Makefile

This file was deleted.

0 comments on commit 06dbbeb

Please sign in to comment.