Skip to content

Commit

Permalink
Merge pull request #123 from clux/bump-zlib
Browse files Browse the repository at this point in the history
Try fixing build by bumping versions
  • Loading branch information
clux authored Aug 26, 2023
2 parents 06dc8cc + 0ccc699 commit 2e68edf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN apt-get update && apt-get install -y \

# Install rust using rustup
ARG CHANNEL
ENV RUSTUP_VER="1.25.1" \
ENV RUSTUP_VER="1.26.0" \
RUST_ARCH="x86_64-unknown-linux-gnu" \
CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse

Expand All @@ -53,10 +53,10 @@ RUN chmod a+X /root
# Convenience list of versions and variables for compilation later on
# This helps continuing manually if anything breaks.
ENV SSL_VER="1.1.1q" \
CURL_VER="7.85.0" \
ZLIB_VER="1.2.13" \
CURL_VER="8.2.1" \
ZLIB_VER="1.3" \
PQ_VER="11.12" \
SQLITE_VER="3390400" \
SQLITE_VER="3420000" \
CC=musl-gcc \
PREFIX=/musl \
PATH=/usr/local/bin:/root/.cargo/bin:$PATH \
Expand Down Expand Up @@ -112,7 +112,7 @@ RUN curl -sSL https://ftp.postgresql.org/pub/source/v$PQ_VER/postgresql-$PQ_VER.
cd .. && rm -rf postgresql-$PQ_VER

# Build libsqlite3 using same configuration as the alpine linux main/sqlite package
RUN curl -sSL https://www.sqlite.org/2022/sqlite-autoconf-$SQLITE_VER.tar.gz | tar xz && \
RUN curl -sSL https://www.sqlite.org/2023/sqlite-autoconf-$SQLITE_VER.tar.gz | tar xz && \
cd sqlite-autoconf-$SQLITE_VER && \
CFLAGS="-DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_RTREE -DSQLITE_USE_URI -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1" \
CC="musl-gcc -fPIC -pie" \
Expand Down

0 comments on commit 2e68edf

Please sign in to comment.