PFP-5626 Skille ut docker-config fra fpsak-frontend (navikt#551)

Author: Michael Johansen

.dockerignore

@@ -1,8 +1,11 @@
-.git
+.git*
 *Dockerfile*
 *docker-compose*
 **/node_modules
 cypress
 coverage
 .nyc_output
 packages
+eslint
+travis
+webpack

.gitignore

@@ -2,6 +2,7 @@
 /.idea
 /bin/
 /.tmp/
+/tmp/
 /.happypack/
 /.nyc_output/
 /.eslint_loader_cache/
@@ -12,9 +13,6 @@ cypress.env.json
 *.iml
 *.log*
 /target/
-**/cypress/videos
-**/cypress/screenshots
-**/cypress/test-data/test-identer
 /node_modules
 npm-debug.log
 lib/
@@ -26,3 +24,4 @@ lerna-debug.log
 ssh.exe.stackdump
 ssh.exe.stackdump
 .DS_Store
+tmp/

DockerfileNext Dockerfile

@@ -1,7 +1,5 @@
-FROM navikt/nginx-spa-docker:latest
+FROM navikt/nginx-oidc:latest
 # FPSAK spesifikk
-# Dette er den nye dockerfila som baserer seg på ferdigbygd baseimage.
-
 ENV APP_DIR="/app" \
 	APP_PATH_PREFIX="/fpsak" \
 	APP_CALLBACK_PATH="/fpsak/cb" \
@@ -13,5 +11,6 @@ ENV APP_DIR="/app" \
 COPY dist /app/fpsak/
 
 #FPSAK spesifkk
-COPY public/proxy.nginx      /nginx/proxy.nginx
-EXPOSE 9090
+COPY k8s/proxy.nginx      /nginx/proxy.nginx
+
+EXPOSE 9000 443

JenkinsfileAutoTag

@@ -1,21 +1,22 @@
 node('DOCKER2') {
-    def tagName=''
+   def tagName=''
+   dockerRegistry = "repo.adeo.no:5443"
    stage('Checkout Tags') { // checkout only tags.
       checkout scm
       sh(script: 'git fetch --tags')
       tagName=sh(returnStdout: true, script: 'git describe --tags `git rev-list --tags --max-count=1`').toString().trim()
       echo "Tag to be deployed $tagName"
-      
+
       sh(script: 'git checkout $tagName')
       sh(script: 'git log --oneline -n10')
    }
    stage('Build and Push'){
       sh 'PATH=$PATH:/usr/local/lib/node/nodejs/bin:/opt/yarn-v1.12.3/bin; yarn install --ignore-scripts'
       sh 'PATH=$PATH:/usr/local/lib/node/nodejs/bin:/opt/yarn-v1.12.3/bin; yarn build'
-      sh "docker build -t docker.adeo.no:5000/fpsak-frontend:$tagName -f ./docker/Dockerfile ./ --build-arg HTTPS_PROXY=$HTTPS_PROXY --build-arg HTTP_PROXY=$HTTP_PROXY"
-      sh "docker tag docker.adeo.no:5000/fpsak-frontend:$tagName docker.adeo.no:5000/fpsak-frontend:latest"
-      sh "docker push docker.adeo.no:5000/fpsak-frontend:$tagName"
-      sh "docker push docker.adeo.no:5000/fpsak-frontend:latest"
+      sh "docker build -t $dockerRegistry/fpsak-frontend:$tagName -f ./Dockerfile ./ --build-arg HTTPS_PROXY=$HTTPS_PROXY --build-arg HTTP_PROXY=$HTTP_PROXY"
+      sh "docker tag $dockerRegistry/fpsak-frontend:$tagName $dockerRegistry/fpsak-frontend:latest"
+      sh "docker push $dockerRegistry/fpsak-frontend:$tagName"
+      sh "docker push $dockerRegistry/fpsak-frontend:latest"
    }
    stage('Deploy'){
       build job: 'fpsak-frontend-BUILD', parameters: [string(name: 'miljø', value: 't10'), string(name: 'versjonNummer', value: tagName)], wait: true

docker-compose.yml

@@ -1,51 +1,19 @@
 version: '3'
 services:
-  fpfront:
-    build:
-      context: .
-      dockerfile: DockerfileNext
+  frontend:
+    build: .
     ports:
       - 9090:9090
     environment:
       - APP_PORT=9090
-      - APP_URL_FPSAK=http://fpsak:8080
-      - OIDC_HOST_URL=http://host.docker.internal:8060/isso/oauth2
+      - APP_URL_FPSAK=http://host.docker.internal:8080
+      - OIDC_HOST_URL=http://host.docker.internal:8060/rest/isso/oauth2
       - OIDC_REDIRECT_URI=http://localhost:9090/fpsak/cb
       - REDIS_HOST=redis
     links:
       - redis
+    volumes:
+      - ./dist:/app/fpsak
+
   redis:
     image: redis
-  fpmock2:
-    image: repo.adeo.no:5443/fpmock2:v201903111706
-    ports:
-      - 8060:8060 # HTTP
-      - 8063:8063 # HTTPS
-      - 8636:8636 # LDAPS
-    environment:
-      - AUTHORIZE_BASE_URL=http://localhost:8060
-      - AUTOTEST_FPSAK_BASE_URL=http://fpsak:8080
-      - AUTOTEST_OAUTH2_ISSUER=https://fpmock2:8063/isso/oauth2
-      - AUTOTEST_VTP_BASE_URL=http://fpmock2:8060
-      - CUSTOM_KEYSTORE_PASSWORD=changeit
-      - CUSTOM_KEYSTORE_PATH=/app/testcerts/vtpkeystore.jks
-      - ENABLE_CUSTOM_TRUSTSTORE=true
-      - LDAP_PROVIDER_URL=ldaps://fpmock2:8636
-      - NAV_TRUSTSTORE_PASSWORD=changeit
-      - NAV_TRUSTSTORE_PATH=/app/testcerts/nav_truststore_path
-  fpsak:
-    image: repo.adeo.no:5443/fpsak-for-vtp:v201903111317
-    restart: on-failure
-    links:
-      - fpsak-oracle
-      - fpmock2
-    ports:
-      - 8080:8080
-    environment:
-      - DEFAULTDS_URL=jdbc:oracle:thin:@fpsak-oracle:1521/XE
-      - DVHDS_URL=jdbc:oracle:thin:@fpsak-oracle:1521/XE
-  fpsak-oracle:
-    image: repo.adeo.no:5443/fpsak-oracle:v201902281601
-    shm_size: 1gb
-    ports:
-      - 1521:1521