File tree 3 files changed +9
-15
lines changed 3 files changed +9
-15
lines changed Original file line number Diff line number Diff line change @@ -42,21 +42,7 @@ RUN ln -s /usr/bin/python3.10 /usr/bin/python
42
42
# https://github.com/rust-lang/rustup/issues/297#issuecomment-444818896
43
43
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
44
44
ENV PATH="${HOME}/.cargo/bin:${PATH}"
45
-
46
- # Find OpenSSL paths, set environment variables, and persist them
47
- RUN OPENSSL_LIB_PATH=$(find / -name 'libssl.so*' 2>/dev/null | head -n 1) && \
48
- OPENSSL_LIB_DIR=$(dirname "$OPENSSL_LIB_PATH" ) && \
49
- OPENSSL_INCLUDE_PATH=$(find /usr -name 'ssl.h' 2>/dev/null | grep -v '/node/' | head -n 1) && \
50
- OPENSSL_INCLUDE_DIR=$(dirname "$OPENSSL_INCLUDE_PATH" ) && \
51
- echo "OPENSSL_LIB_DIR=$OPENSSL_LIB_DIR" && \
52
- echo "OPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR" && \
53
- echo "OPENSSL_STATIC=$OPENSSL_STATIC" && \
54
- export OPENSSL_LIB_DIR OPENSSL_INCLUDE_DIR
55
-
56
- # Set the environment variables for future stages (persistent across containers)
57
- ENV OPENSSL_LIB_DIR=$OPENSSL_LIB_DIR \
58
- OPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR \
59
- OPENSSL_STATIC=1
45
+ ENV OPENSSL_STATIC=1
60
46
61
47
# Download and unzip the github actions runner
62
48
RUN mkdir actions-runner && cd actions-runner \
Original file line number Diff line number Diff line change
1
+ OPENSSL_LIB_PATH=$( find / -name ' libssl.so*' 2> /dev/null | head -n 1)
2
+ OPENSSL_LIB_DIR=$( dirname " $OPENSSL_LIB_PATH " )
3
+ OPENSSL_INCLUDE_PATH=$( find /usr -name ' ssl.h' 2> /dev/null | grep -v ' /node/' | head -n 1)
4
+ OPENSSL_INCLUDE_DIR=$( dirname " $OPENSSL_INCLUDE_PATH " )
5
+ export OPENSSL_STATIC=1
6
+ export OPENSSL_LIB_DIR=" $OPENSSL_LIB_DIR "
7
+ export OPENSSL_INCLUDE_DIR=" $OPENSSL_INCLUDE_DIR "
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ source "${current_dir}/detector.sh"
13
13
source " ${current_dir} /config.sh"
14
14
source " ${current_dir} /notify.sh"
15
15
source " ${current_dir} /squire.sh"
16
+ source " ${current_dir} /openssl.sh"
16
17
17
18
# Env vars (docker-compose.yml)
18
19
RUNNER_NAME=" ${RUNNER_NAME:- " $( instance_id) " } "
You can’t perform that action at this time.
0 commit comments