Skip to content

Commit 654e436

Browse files
authored
Merge pull request #3 from palfrey/stock-aports
Redo dockerised build without my custom aports hack
2 parents b170c00 + cfe242e commit 654e436

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

Dockerfile

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
FROM rust:1.38.0-alpine3.10 as builder
1+
FROM alpine:edge as builder
22

3-
RUN apk add --no-cache git abuild musl-dev make file
4-
RUN cd / && git clone -b static-builds https://github.com/palfrey/aports.git
5-
RUN abuild-keygen -ain
6-
RUN cd /aports/main/unixodbc/ && abuild -F fetch unpack build rootpkg
7-
RUN apk add --no-cache bash m4 help2man
8-
RUN cd /aports/main/libtool/ && abuild -F fetch unpack build rootpkg
9-
RUN apk index -o ~/packages/main/x86_64/APKINDEX.tar.gz ~/packages/main/x86_64/*.apk
10-
RUN apk add --allow-untrusted --no-cache --repository ~/packages/main/ unixodbc-static unixodbc-dev libltdl-static
11-
12-
# FIXME: Revert back to this once the following PRs are merged
13-
# * https://github.com/alpinelinux/aports/pull/12004 (creates unixodbc-static)
14-
# * https://github.com/alpinelinux/aports/pull/12083 (creates libltdl-static)
15-
# RUN apk add --no-cache unixodbc-dev unixodbc-static libltdl-static
3+
RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing rustup && rustup-init -y --default-host x86_64-unknown-linux-musl
4+
RUN apk add --no-cache gcc file unixodbc-dev unixodbc-static libltdl-static
5+
ENV PATH=$PATH:/root/.cargo/bin
166

177
WORKDIR /app
188
ADD . ./

0 commit comments

Comments
 (0)