Commit 223490a 1 parent 8060022 commit 223490a Copy full SHA for 223490a
File tree 3 files changed +22
-25
lines changed
3 files changed +22
-25
lines changed Original file line number Diff line number Diff line change @@ -52,15 +52,15 @@ jobs:
52
52
path : client/packages/host/dist
53
53
54
54
- name : Build server
55
- run : docker run --rm --user "$(id -u)":"$(id -g)" -v "$PWD":/usr/src/omsupply -w /usr/src/omsupply/server rust:slim cargo build --bin remote_server --bin remote_server_cli
55
+ run : docker run --rm --user "$(id -u)":"$(id -g)" -v "$PWD":/usr/src/omsupply -w /usr/src/omsupply/server rust:slim cargo build --release -- bin remote_server --bin remote_server_cli
56
56
57
57
- name : Save artifacts
58
58
uses : actions/upload-artifact@v4
59
59
with :
60
60
name : server-executables
61
61
path : |
62
- server/target/debug /remote_server
63
- server/target/debug /remote_server_cli
62
+ server/target/release /remote_server
63
+ server/target/release /remote_server_cli
64
64
retention-days : 1
65
65
66
66
dockerise :
76
76
uses : actions/download-artifact@v4
77
77
with :
78
78
name : server-executables
79
- path : server/target/debug /
79
+ path : server/target/release /
80
80
81
81
- name : Set up Docker Buildx
82
82
uses : docker/setup-buildx-action@v3
Original file line number Diff line number Diff line change 1
1
2
2
FROM rust:slim
3
3
4
- RUN apt-get update && apt-get install -y faketime
4
+ RUN apt-get update && apt-get install git make
5
+
6
+ # Install faketime
7
+ WORKDIR /usr/src/
8
+ RUN git clone https://github.com/wolfcw/libfaketime.git
9
+ WORKDIR /usr/src/libfaketime/src
10
+ RUN make install
11
+ # This will make libfaketime.so.1 run when time is requested form the system
12
+ # making FAKETIME env variable work
13
+ RUN echo "/usr/src/libfaketime/src/libfaketime.so.1" > /etc/ld.so.preload
5
14
6
15
WORKDIR /usr/src/omsupply/server
7
16
# Copy executable
8
- COPY server/target/debug /remote_server .
9
- COPY server/target/debug /remote_server_cli .
17
+ COPY server/target/release /remote_server .
18
+ COPY server/target/release /remote_server_cli .
10
19
# Copy entry
11
20
COPY docker/entry.sh .
12
21
# Copy reference file
Original file line number Diff line number Diff line change @@ -17,22 +17,10 @@ if [ ! -z "$LOAD_REFERENCE_FILE" ]; then
17
17
MSUPPLY_NO_TEST_DB_TEMPLATE=1 ./remote_server_cli initialise-from-export -n " $LOAD_REFERENCE_FILE "
18
18
fi
19
19
20
+ # Refresh dates
21
+ if [ " $SHOULD_REFRESH_DATES " = true ]; then
22
+ echo " Refreshing dates"
23
+ ./remote_server_cli refresh-dates
24
+ fi
20
25
21
- # Run the remote_server with or without faketime
22
- if [ ! -z " $FAKE_DATETIME " ]; then
23
- # Refresh dates
24
- if [ " $SHOULD_REFRESH_DATES " = true ]; then
25
- echo " Refreshing dates"
26
- faketime " $FAKE_DATETIME " ./remote_server_cli refresh-dates
27
- fi
28
- echo " Starting remote_server with faketime: $FAKE_DATETIME "
29
- exec faketime " $FAKE_DATETIME " ./remote_server
30
- else
31
- # Refresh dates
32
- if [ " $SHOULD_REFRESH_DATES " = true ]; then
33
- echo " Refreshing dates"
34
- ./remote_server_cli refresh-dates
35
- fi
36
- echo " Starting remote_server normally"
37
- exec ./remote_server
38
- fi
26
+ exec ./remote_server
You can’t perform that action at this time.
0 commit comments