Skip to content
Snippets Groups Projects
Commit b4907a8e authored by Ronnie Friman's avatar Ronnie Friman
Browse files

ci-fix for https

parent 74af942c
No related branches found
No related tags found
No related merge requests found
Pipeline #64100 passed
Stage: purge
    Stage: build
      Stage: rf-test
        Stage: push-results
          Hide whitespace changes
          Inline Side-by-side
          .gitlab-ci.yml
          + 1
          − 1
          View file @ b4907a8e
          ...@@ -28,7 +28,7 @@ docker-build: ...@@ -28,7 +28,7 @@ docker-build:
          script: script:
          - printf "REACT_APP_URL=%s\n" "$REACT_APP_URL" > .env - printf "REACT_APP_URL=%s\n" "$REACT_APP_URL" > .env
          - docker build -t overflow2019/frontend:test . - docker build -t overflow2019/frontend:test .
          - docker run --name front -p 8080:3000 -d overflow2019/frontend:test - docker run --name front -p 8080:80 -d overflow2019/frontend:test
          rf-test: rf-test:
          image: gitlab.labranet.jamk.fi:4567/wimma-lab-2019/mysticons/devsecops/robot image: gitlab.labranet.jamk.fi:4567/wimma-lab-2019/mysticons/devsecops/robot
          ......
          Dockerfile
          + 1
          − 1
          View file @ b4907a8e
          ...@@ -9,5 +9,5 @@ RUN npm run build ...@@ -9,5 +9,5 @@ RUN npm run build
          # production environment # production environment
          FROM nginx:1.16.0-alpine FROM nginx:1.16.0-alpine
          COPY --from=build /usr/src/app/build /usr/share/nginx/html COPY --from=build /usr/src/app/build /usr/share/nginx/html
          EXPOSE 3000 EXPOSE 80
          CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]
          tests/resource.robot
          + 1
          − 1
          View file @ b4907a8e
          ...@@ -7,7 +7,7 @@ ${SERVER} %{SITE_URL} ...@@ -7,7 +7,7 @@ ${SERVER} %{SITE_URL}
          ${BROWSER} ff ${BROWSER} ff
          ${DELAY} 0.5 ${DELAY} 0.5
          ${VALID PASSWORD} = koira ${VALID PASSWORD} = koira
          ${LOGIN URL} http://${SERVER}/ ${LOGIN URL} https://${SERVER}/
          ${WELCOME URL} #You can use this if there's a different page after login page. ${WELCOME URL} #You can use this if there's a different page after login page.
          ${LOC_USER} id=registerUsernameInput #Generated username. ${LOC_USER} id=registerUsernameInput #Generated username.
          ${LOC_PASSWORD} id=registerPasswordInput #Generated password first time. ${LOC_PASSWORD} id=registerPasswordInput #Generated password first time.
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment