Skip to content

Commit

Permalink
Removing cache & platforms for base testing
Browse files Browse the repository at this point in the history
  • Loading branch information
ShahanaFarooqui committed Jun 13, 2024
1 parent 7573e21 commit 31d6bf4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,11 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: .
push: true
platforms: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/arm/v7
tags: |
shahanafarooqui/lightningd:${{ github.event.inputs.version }}
shahanafarooqui/lightningd:latest
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
elementsproject/lightningd:${{ github.event.inputs.version }}
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ RUN rustup toolchain install stable --component rustfmt --allow-downgrade
COPY --from=downloader /usr/bin/${target_host_qemu} /usr/bin/${target_host_qemu}
WORKDIR /opt/lightningd

# Build the configurator binary for each architecture
# Fix `configurator: Exec format error` on ARM and ARM64
RUN $CC -o ccan/tools/configurator/configurator ccan/tools/configurator/configurator.c

# If cross-compiling, need to tell it to cargo.
RUN ( ! [ -n "${target_host}" ] ) || \
(mkdir -p .cargo && echo "[target.${target_host_rust}]\nlinker = \"${target_host}-gcc\"" > .cargo/config)
Expand All @@ -198,6 +202,8 @@ RUN ./configure --prefix=/tmp/lightning_install --enable-static && \
make && \
/root/.local/bin/poetry run make install

RUN apt-get update && apt-get install -y bash

# We need to build python plugins on the target's arch because python doesn't support cross build
FROM ${BASE_DISTRO} as builder-python
RUN apt-get update -qq && \
Expand Down

0 comments on commit 31d6bf4

Please sign in to comment.