Make lcli docker image portable (#5069)

* Set lcli docker build to use portable feature (#4370)

* Merge remote-tracking branch 'origin/unstable' into unstable
This commit is contained in:
Sylvain Bossut 2024-01-30 04:03:48 +01:00 committed by GitHub
parent 020702f8eb
commit 0f345c7e0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions

View File

@ -152,10 +152,12 @@ jobs:
- name: Dockerhub login - name: Dockerhub login
run: | run: |
echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
- name: Build lcli dockerfile (with push) - name: Build lcli and push
run: | uses: docker/build-push-action@v5
docker build \ with:
--build-arg PORTABLE=true \ build-args: |
--tag ${LCLI_IMAGE_NAME}:${VERSION}${VERSION_SUFFIX} \ FEATURES=portable
--file ./lcli/Dockerfile . context: .
docker push ${LCLI_IMAGE_NAME}:${VERSION}${VERSION_SUFFIX} push: true
file: ./lcli/Dockerfile
tags: ${{ env.LCLI_IMAGE_NAME }}:${{ env.VERSION }}${{ env.VERSION_SUFFIX }}

View File

@ -4,8 +4,8 @@
FROM rust:1.73.0-bullseye AS builder FROM rust:1.73.0-bullseye AS builder
RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake libclang-dev RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake libclang-dev
COPY . lighthouse COPY . lighthouse
ARG PORTABLE ARG FEATURES
ENV PORTABLE $PORTABLE ENV FEATURES $FEATURES
RUN cd lighthouse && make install-lcli RUN cd lighthouse && make install-lcli
FROM ubuntu:22.04 FROM ubuntu:22.04