Skip to content

Commit c8d5418

Browse files
authored
fix: set permissions for /usr/local/bin (#16)
1 parent cbb3baa commit c8d5418

File tree

2 files changed

+40
-13
lines changed

2 files changed

+40
-13
lines changed

tests/test.bats

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ setup() {
3636
assert_success
3737
run ddev start -y
3838
assert_success
39+
40+
export USE_CUSTOM_NODE=false
3941
}
4042

4143
health_checks() {
@@ -70,6 +72,12 @@ health_checks() {
7072
run ddev exec python -c "import ssl; print('SSL:', ssl.OPENSSL_VERSION)"
7173
assert_success
7274
assert_output "('SSL:', 'OpenSSL 1.1.1d 10 Sep 2019')"
75+
76+
if [ "${USE_CUSTOM_NODE:-}" = "true" ]; then
77+
run ddev exec node -v
78+
assert_success
79+
assert_output --regexp '^v18\.[0-9]+\.[0-9]+$'
80+
fi
7381
}
7482

7583
teardown() {
@@ -94,6 +102,21 @@ teardown() {
94102
health_checks
95103
}
96104

105+
@test "install with node v18" {
106+
set -eu -o pipefail
107+
108+
export USE_CUSTOM_NODE=true
109+
run ddev config --nodejs-version=v18
110+
assert_success
111+
112+
echo "# ddev add-on get ${DIR} with project ${PROJNAME} in $(pwd)" >&3
113+
run ddev add-on get "${DIR}"
114+
assert_success
115+
run ddev restart -y
116+
assert_success
117+
health_checks
118+
}
119+
97120
# bats test_tags=release
98121
@test "install from release" {
99122
set -eu -o pipefail

web-build/Dockerfile.python2

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@
22
COPY --from=python:2.7-slim /usr/local /usr/local
33
COPY --from=python:2.7-slim /usr/lib /tmp/python2-libs
44
ARG TARGETARCH
5-
RUN if [ "$TARGETARCH" = "amd64" ]; then \
6-
LIB_ARCH="x86_64-linux-gnu"; \
7-
elif [ "$TARGETARCH" = "arm64" ]; then \
8-
LIB_ARCH="aarch64-linux-gnu"; \
9-
else \
10-
echo "Unsupported architecture: $TARGETARCH"; exit 1; \
11-
fi && \
12-
echo "Detected architecture: $TARGETARCH ($LIB_ARCH)" && \
13-
mkdir -p /usr/lib/$LIB_ARCH && \
14-
cp /tmp/python2-libs/*/libssl.so.1.1 /usr/lib/$LIB_ARCH/ && \
15-
cp /tmp/python2-libs/*/libcrypto.so.1.1 /usr/lib/$LIB_ARCH/ && \
16-
rm -rf /tmp/python2-libs && \
17-
ldconfig
5+
RUN <<EOF
6+
set -eu -o pipefail
7+
chmod -f ugo+rwx /usr/local/bin
8+
if [ "$TARGETARCH" = "amd64" ]; then
9+
LIB_ARCH="x86_64-linux-gnu"
10+
elif [ "$TARGETARCH" = "arm64" ]; then
11+
LIB_ARCH="aarch64-linux-gnu"
12+
else
13+
echo "Unsupported architecture: $TARGETARCH" >&2
14+
exit 1
15+
fi
16+
mkdir -p /usr/lib/$LIB_ARCH
17+
cp /tmp/python2-libs/*/libssl.so.1.1 /usr/lib/$LIB_ARCH/
18+
cp /tmp/python2-libs/*/libcrypto.so.1.1 /usr/lib/$LIB_ARCH/
19+
rm -rf /tmp/python2-libs
20+
ldconfig
21+
EOF

0 commit comments

Comments
 (0)