Alsu master

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12-alpine
+FROM node:14-alpine
 RUN apk update && \
     apk add openssl
 
@@ -8,19 +8,10 @@ RUN apk add --no-cache tini
 ENTRYPOINT ["/sbin/tini", "--"]
 # web port
 EXPOSE 3001
-# api port
-EXPOSE 3443
+# api port if https enabled
+# EXPOSE 3443
 
 COPY . /app
-# create the certification file for ssl
-WORKDIR /app/docker
-RUN PASSWORD=$(openssl rand -hex 16) && \
-    openssl genrsa -des3 -passout "pass:${PASSWORD}" -out server.pass.key 2048 && \
-    openssl rsa -passin "pass:${PASSWORD}" -in server.pass.key -out server.key && \
-    rm server.pass.key && \
-    openssl req -new -key server.key -out server.csr \
-        -subj "/C=US/ST=WA/L=Seattle/O=Traveler/OU=Dev/CN=example.com" && \
-    openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
 WORKDIR /app
 RUN npm install --only=prod
 RUN npm install -g [email protected]

README.md

@@ -32,10 +32,10 @@ For detailed deployment instructions please see https://confluence.aps.anl.gov/d
     ./etc/init.d/traveler-webapp start
     # Check progress of traveler-webapp
     ./etc/init.d/traveler-webapp status
-    
+
 **Installing docker version (not for production use, but good for development and evaluation)**
 
-1. centos docker install (centos) https://docs.docker.com/install/linux/docker-ce/centos/ 
+1. centos docker install (centos) https://docs.docker.com/install/linux/docker-ce/centos/
    * uninstall old docker versions
    ```
    sudo yum remove docker \
@@ -68,7 +68,7 @@ For detailed deployment instructions please see https://confluence.aps.anl.gov/d
    ```
    sudo systemctl enable docker
    ```
-   * install docker-compose https://docs.docker.com/compose/install/ 
+   * install docker-compose https://docs.docker.com/compose/install/
    ```
    sudo curl -L "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
    sudo chmod +x /usr/local/bin/docker-compose
@@ -83,17 +83,17 @@ For detailed deployment instructions please see https://confluence.aps.anl.gov/d
    sudo docker network create -d bridge --subnet 172.18.1.0/24 traveler-dev
    ```
 3. install dependencies
-   * traveler-mongo https://github.com/dongliu/traveler-mongo 
+   * traveler-mongo https://github.com/dongliu/traveler-mongo
       * clone git repo
       ```
       git clone https://github.com/dongliu/traveler-mongo.git (to e.g., ~/git/traveler)
       ```
       * run traveler-mongo
       ```
-      sudo docker-compose up 
+      sudo docker-compose up
       ```
       * access mongo express at http://localhost:8081. The username is traveler, and password is travelerpass.
-   * traveler-ldap https://github.com/dongliu/traveler-ldap 
+   * traveler-ldap https://github.com/dongliu/traveler-ldap
       * clone git repo
       ```
       git clone https://github.com/dongliu/traveler-ldap.git
@@ -104,7 +104,7 @@ For detailed deployment instructions please see https://confluence.aps.anl.gov/d
       ```
       * test
          * You can check the state of the openladp service via the php ldap admin web https://localhost:6443. There is a default admin account that you can use to log in user name: cn=admin,dc=example,dc=org password: admin
-4. install traveler https://github.com/AdvancedPhotonSource/traveler 
+4. install traveler https://github.com/AdvancedPhotonSource/traveler
    * clone git repo
    ```
    git clone https://github.com/AdvancedPhotonSource/traveler.git

app.js

@@ -190,16 +190,16 @@ app.get('/apis', function(req, res) {
 // Start application using settings
 var appPort = appSettings.app_port;
 var server;
-if (appSettings.ssl_key !== undefined) {
+if (appSettings.ssl_key) {
   var appCredentials = {
     key: fs.readFileSync('./' + configPath + '/' + appSettings.ssl_key),
     cert: fs.readFileSync('./' + configPath + '/' + appSettings.ssl_cert),
   };
   server = https.createServer(appCredentials, app).listen(appPort, function() {
-    logger.info('Express server listening on ssl port ' + appPort);
+    logger.info('Express server listening on ssl port ' + app.get('port'));
   });
 } else {
-  server = http.createServer(app).listen(app.get('port'), function() {
+  server = http.createServer(app).listen(appPort, function() {
     logger.info('Express server listening on port ' + app.get('port'));
   });
 }
@@ -221,7 +221,7 @@ require('./routes/api')(api);
 
 //Start Api using settings
 var apiserver;
-if (apiSettings.ssl_key !== undefined) {
+if (apiSettings.ssl_key) {
   var apiCredentials = {
     key: fs.readFileSync('./' + configPath + '/' + apiSettings.ssl_key),
     cert: fs.readFileSync('./' + configPath + '/' + apiSettings.ssl_cert),
@@ -233,7 +233,7 @@ if (apiSettings.ssl_key !== undefined) {
       logger.info('API server listening on ssl port ' + api.get('port'));
     });
 } else {
-  apiserver = http.createServer(api).listen(api.get('port'), function() {
+  apiserver = http.createServer(api).listen(apiPort, function() {
     logger.info('API server listening on port ' + api.get('port'));
   });
 }

docker-compose.yml

@@ -1,19 +1,21 @@
 version: "3"
 networks:
   default:
-    external:
-      name: traveler-dev
+    external: true
+    name: traveler-dev
 services:
   web:
     build: .
     volumes:
       - .:/app
       # exclude the node_modules
       - /app/node_modules
-      - /app/docker
+      # exclude the docker configuration
+      # - /app/docker
     ports:
       - "3001:3001"
-      - "3443:3443"
+      - "3002:3002"
+      # - "3443:3443"
     restart: unless-stopped
     command: nodemon app.js
     environment:

docker.md

@@ -2,13 +2,20 @@
 
 ## install docker
 
-See <https://docs.docker.com/install/> for instructions.
+See <https://docs.docker.com/get-docker/> for instructions.
 
-You will alos need to install docker compose if it does not come with docker, see <https://docs.docker.com/compose/install/#install-compose>.
+After installation finished, start the docker desktop, configure it for CPU, memory, and storage that you want it to use on your machine.
+
+Check if the docker desktop has `docker-compose` installed on your machine. If not, you need to install docker compose, see <https://docs.docker.com/compose/install/>.
 
 ## create development network
 
-The traveler application and its dependencies will be running in the same network named `traveler-dev`. Run the following to create the network.
+Clone this repo to your local environment. Make sure you have the `traveler-dev` network in the docker.
+```
+docker network list
+```
+
+If not, run the following in your console to create the network.
 
 ```
 docker network create -d bridge --subnet 172.18.1.0/24 traveler-dev
@@ -28,15 +35,19 @@ The traveler application can be run by running
 docker-compose up
 ```
 
-The traveler application can be accessed at <https://localhost:3001>
+The traveler application can be accessed at <http://localhost:3001>
+
+If you want to server the application or the api on https, add `ssl_key` and `ssl_cert` configurations in the `app.json` and `api.json` files. You will need valid key and cert files in the `docker` directory, and set the values of `ssl_key` and `ssl_cert` to the name of the files.
 
 When you run for the first time, docker will build the image for you. If the application does not start successfully, try
 
 ```
 docker-compose --verbose up
 ```
 
-for detailed information. You should also check the logs of mongodb and open ldap service to see if there is an issue with those services. You can ssh into the running container with `docker exec -it traveler-aps_web_1 /bin/bash`, where `traveler-aps_web_1` is the running container name.
+for detailed information. You should also check the logs of mongodb and open ldap service to see if there is an issue with those services. You can ssh into the running container with `docker exec -it traveler_web_1 /bin/sh`, where `traveler_web_1` is the running container name.
+
+`docker container list` shows all the containers running on your local.
 
 Run
 
@@ -47,3 +58,13 @@ docker-compose down
 to stop the appplication.
 
 You can run with `docker-compose up -d` in a detached mode. Then you can run `docker-compose logs -f` to check the application log.
+
+## rebulid without cache
+
+```
+docker-compose build --no-cache
+```
+
+## clean the traveler docker image
+
+Run `docker image list` to see the images on your local. `docker image remove image_name` to clean the image from yoru local.

docker/api.json

@@ -3,7 +3,5 @@
       "api_read": "api_read_password",
       "api_write": "api_write_password"
   },
-  "app_port" : "3443",
-  "ssl_key": "server.key",
-  "ssl_cert": "server.crt"
+  "app_port" : "3002"
 }

docker/app.json

@@ -1,8 +1,6 @@
 {
   "org_name": "Lab",
   "app_port": "3001",
-  "ssl_key": "server.key",
-  "ssl_cert": "server.crt",
   "top_bar_urls": [
     {
       "text": "Link",

docker/auth.json

@@ -1,7 +1,7 @@
 {
   "type": "ldap",
-  "service": "https://localhost:3001",
-  "login_service": "https://localhost:3001/login",
+  "service": "http://localhost:3001",
+  "login_service": "http://localhost:3001/login",
   "default_roles": [
     "read_all_forms",
     "write_public_travelers"