fix: Rebuild docker image using newer versions and add a Makefile.
This commit is contained in:
@@ -2,10 +2,10 @@ FROM alpine:edge AS builder
|
||||
|
||||
# Update databases
|
||||
RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
|
||||
apk update
|
||||
apk update --no-cache
|
||||
|
||||
# Download base dependencies
|
||||
RUN apk add \
|
||||
RUN apk add --no-cache \
|
||||
git \
|
||||
make \
|
||||
cmake \
|
||||
@@ -24,10 +24,11 @@ RUN apk add \
|
||||
cython \
|
||||
py3-yaml \
|
||||
py3-simplejson \
|
||||
py3-intervaltree
|
||||
py3-intervaltree \
|
||||
libunwind-dev
|
||||
|
||||
# Install yosys
|
||||
RUN apk add yosys
|
||||
RUN apk add --no-cache yosys
|
||||
|
||||
WORKDIR /home/root/aur-install
|
||||
|
||||
@@ -99,8 +100,8 @@ FROM alpine:edge
|
||||
|
||||
# Install dependencies available in apk
|
||||
RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
|
||||
apk update && \
|
||||
apk add abc py3-yaml py3-simplejson py3-intervaltree py3-arpeggio openfpgaloader
|
||||
apk update --no-cache && \
|
||||
apk add --no-cache abc py3-yaml py3-simplejson py3-intervaltree py3-arpeggio openfpgaloader
|
||||
|
||||
# Get dependencies back
|
||||
COPY --from=builder /dependencies /
|
||||
@@ -112,9 +113,10 @@ COPY --from=builder /home/root/aur-install/nextpnr/build/share /usr/share/nextpn
|
||||
COPY --from=builder /usr/share/xray/database/zynq7 /usr/share/xray/database/zynq7
|
||||
|
||||
# These 3 python dependencies were built in the previous image
|
||||
COPY --from=builder /usr/lib/python3.12/site-packages/prjxray /usr/lib/python3.12/site-packages/prjxray
|
||||
COPY --from=builder /usr/lib/python3.12/site-packages/fasm /usr/lib/python3.12/site-packages/fasm
|
||||
COPY --from=builder /usr/lib/python3.12/site-packages/textx /usr/lib/python3.12/site-packages/textx
|
||||
# COPY --from=builder /usr/lib/python3.14/site-packages/prjxray /usr/lib/python3.14/site-packages/prjxray
|
||||
# COPY --from=builder /usr/lib/python3.14/site-packages/fasm /usr/lib/python3.14/site-packages/fasm
|
||||
# COPY --from=builder /usr/lib/python3.14/site-packages/textx /usr/lib/python3.14/site-packages/textx
|
||||
COPY --from=builder /usr/lib/python3.14/site-packages /usr/lib/python3.14/site-packages/
|
||||
|
||||
WORKDIR /root/code
|
||||
|
||||
|
||||
Reference in New Issue
Block a user