Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit b52f062

Browse files
committed
Trying updated build with no package-lock
1 parent 64702be commit b52f062

File tree

6 files changed

+20
-7827
lines changed

6 files changed

+20
-7827
lines changed

build.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
set -eo pipefail
33
APP_NAME=$1
44
UPDATE_CACHE=""
5-
#docker-compose -f docker/docker-compose.yml build $APP_NAME
6-
docker build -f docker/Dockerfile -t $APP_NAME:latest .
5+
docker-compose -f docker/docker-compose.yml build $APP_NAME
76
docker create --name app $APP_NAME:latest
87

98
if [ -d node_modules ]
109
then
1110
mv package-lock.json old-package-lock.json
12-
docker cp app:/app/package-lock.json package-lock.json
11+
docker cp app:/$APP_NAME/package-lock.json package-lock.json
1312
set +eo pipefail
1413
UPDATE_CACHE=$(cmp package-lock.json old-package-lock.json)
1514
set -eo pipefail
@@ -19,5 +18,5 @@ fi
1918

2019
if [ "$UPDATE_CACHE" == 1 ]
2120
then
22-
docker cp app:/app/node_modules .
21+
docker cp app:/$APP_NAME/node_modules .
2322
fi

docker/Dockerfile

+10-13
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ FROM ibmcom/informix-innovator-c:12.10.FC12W1IE
33
ARG servername=informix
44

55
USER root
6-
RUN mkdir /app
6+
RUN mkdir /legacy-challenge-processor
77
WORKDIR /home/informix
88

9-
RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
10-
echo "deb http://ftp.debian.org/debian/ stretch main non-free contrib" >/etc/apt/sources.list && \
11-
echo "deb http://security.debian.org/ stretch/updates main contrib non-free" >>/etc/apt/sources.list
9+
RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
10+
RUN apt-get -qq update && apt-get -qq install -y \
11+
wget gcc g++ make xz-utils python2.7 git curl
1212

13-
RUN apt-get -qq update && \
14-
apt-get -qq install -y wget gcc-6 g++-6 make xz-utils python2.7 git curl
15-
16-
RUN wget -q -O node10.tar.xz https://nodejs.org/dist/v10.15.1/node-v10.15.1-linux-x64.tar.xz \
17-
&& tar xfJ node10.tar.xz && rm -rf node10.tar.xz
13+
RUN wget -q -O node8.tar.xz https://nodejs.org/dist/v8.11.3/node-v8.11.3-linux-x64.tar.xz \
14+
&& tar xfJ node8.tar.xz && rm -rf node8.tar.xz
1815

1916
ENV SERVERNAME=$servername
2017

@@ -32,7 +29,7 @@ ENV CLIENT_LOCALE=en_US.utf8
3229
ENV DB_LOCALE=en_US.utf8
3330
ENV DBDATE Y4MD-
3431
ENV DBDELIMITER "|"
35-
ENV PATH /home/informix/node-v10.15.1-linux-x64/bin:${INFORMIXDIR}/bin:${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${PATH}
32+
ENV PATH /home/informix/node-v8.11.3-linux-x64/bin:${INFORMIXDIR}/bin:${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${PATH}
3633
ENV LD_LIBRARY_PATH ${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${INFORMIXDIR}/lib/cli
3734
ENV INFORMIXSQLHOSTS /opt/ibm/informix/etc/sqlhosts.informixoltp_tcp
3835
ENV USER root
@@ -41,9 +38,9 @@ ENV LICENSE accept
4138
RUN ln -s /usr/bin/python2.7 /usr/bin/python
4239
RUN echo "sqlexec 2021/tcp" >> /etc/services
4340

44-
COPY . /app
41+
COPY . /legacy-challenge-processor
4542

46-
WORKDIR /app
43+
WORKDIR /legacy-challenge-processor
4744
RUN rm -rf node_modules && npm install --unsafe-perm
4845

49-
ENTRYPOINT [ "npm", "start" ]
46+
ENTRYPOINT [ "npm", "start"]

docker/docker-compose.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
version: '3'
22
services:
3-
legacy-submission-processor:
3+
legacy-challenge-processor:
44
image: legacy-challenge-processor:latest
5+
container_name: legacy-challenge-processor
56
build:
67
context: ../
78
dockerfile: docker/Dockerfile
8-
network_mode: "host"
9+
command: run start

0 commit comments

Comments
 (0)