Skip to content

Commit fe344bd

Browse files
committed
Fix wrapt to v1 for py27
1 parent af298c8 commit fe344bd

File tree

4 files changed

+44
-3
lines changed

4 files changed

+44
-3
lines changed

py27/Dockerfile

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM ubuntu:22.04
2+
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
5+
RUN apt update && apt-get install -y \
6+
curl \
7+
gcc \
8+
libssl-dev \
9+
python3-pip \
10+
pkg-config \
11+
zip \
12+
&& rm -rf /var/lib/apt/lists/*
13+
14+
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
15+
ENV PATH="/root/.cargo/bin:${PATH}"
16+
17+
RUN /root/.cargo/bin/rustup update \
18+
&& /root/.cargo/bin/rustup target add aarch64-unknown-linux-gnu \
19+
&& /root/.cargo/bin/rustup default stable
20+
21+
WORKDIR /var/task
22+
23+
ENV CRYPTEIA_BUILD_OS=debian
24+
ENV CRYPTEIA_BUILD_TARGET=x86_64-unknown-linux-gnu
25+

py27/Dockerfile-test

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ RUN apt-get update && apt-get install -y software-properties-common && add-apt-r
66
RUN apt-get install -y --no-install-recommends \
77
ca-certificates \
88
curl \
9+
util-linux \
10+
file \
11+
binutils \
912
python2.7 \
1013
python2.7-dev \
1114
&& update-alternatives --install /usr/bin/python python /usr/bin/python2.7 2
@@ -16,7 +19,11 @@ RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \
1619
&& apt-get clean \
1720
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1821

19-
COPY ./package/opt /opt
22+
COPY build/crypteia-debian /opt/extensions/crypteia
23+
COPY build/libcrypteia-debian.so /opt/lib/libcrypteia.so
24+
COPY package/opt/crypteia /opt/crypteia
25+
26+
WORKDIR /var/task
2027

2128
ENV CRYPTEIA_BUILD_OS=debian
2229
ENV SKIP_CARGO_TEST=1

py27/setup

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
#!/bin/sh
22
set -e
33

4-
./bin/setup
4+
echo "== [py27/Dockerfile] building... =="
5+
docker build --tag crypteia-debian-py27 --file py27/Dockerfile .
6+
7+
echo "== [py27/Dockerfile] bin/setup =="
8+
docker run \
9+
--rm \
10+
--user root \
11+
--entrypoint "./bin/setup" \
12+
--volume "${PWD}:/var/task" \
13+
crypteia-debian-py27
514

615
echo "== [py27/Dockerfile-test] building... =="
716
docker build --tag crypteia-debian-py27-test --file py27/Dockerfile-test .

python/crypteia/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
setup(
44
version="0.1.0",
5-
install_requires=["wrapt>=1.10.4"]
5+
install_requires=["wrapt>=1.10.4,<1.15.0"] # Pin to version compatible with Python 2.7
66
)

0 commit comments

Comments
 (0)