From ab4f26e57ddf9f53b7ee36a4af3f8485055fc371 Mon Sep 17 00:00:00 2001 From: Rafael Laszlo <rlacko99@gmail.com> Date: Sat, 12 Jun 2021 15:35:54 +0200 Subject: [PATCH] update node version and cleanup gitlab-ci --- .gitlab-ci.yml | 72 +----------------------------------------- Dockerfile | 2 +- docker-compose.dev.yml | 24 -------------- 3 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 docker-compose.dev.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb5a3301..52a23446 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,10 @@ stages: - Build - # - Test - - Docker build - - Deploy - -#services: -# - mongo - -variables: - CONTAINER_IMAGE: "registry.kszk.bme.hu/bodysch/backend:$CI_COMMIT_REF_NAME" -# MONGODB_TEST_URI: 'mongodb://mongo/bodysch-test' Build: stage: Build tags: [docker] - image: node:14 + image: node:16 script: - npm install cache: @@ -24,63 +14,3 @@ Build: expire_in: 1 day paths: - node_modules/ - -#Test: -# stage: Test -# tags: [kszk] -# image: node:14 -# script: -# - npm test -# artifacts: -# expire_in: 1 week -# paths: -# - junit.xml -# reports: -# junit: junit.xml - -Docker build: - stage: Docker build - tags: [docker] - only: - - master - - dev - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - echo "{\"auths\":{\"registry.kszk.bme.hu\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CONTAINER_IMAGE - -Deploy dev: - stage: Deploy - tags: [kszk-deploy] # request the custom SSH executor - only: - - dev - script: # your deploy logic - - echo "$REGISTRY_PASSWORD" | docker login registry.kszk.bme.hu --username $REGISTRY_USER --password-stdin - - cp docker-compose.dev.yml /home/kszk-gitlab-deployer/bodysch-dev/ - - cd /home/kszk-gitlab-deployer/bodysch-dev/ - - docker-compose -f docker-compose.dev.yml --no-ansi pull - - docker-compose -f docker-compose.dev.yml up -d - - docker system prune -f - variables: - SSH_HOST: donald.sch.bme.hu # required - SSH_USER: kszk-gitlab-deployer # default: kszk-gitlab-deployer - SSH_PORT: 10122 # default: 22 - -# Deploy prod: -# stage: Deploy -# tags: [kszk-deploy] # request the custom SSH executor -# only: -# - master -# script: # your deploy logic -# - echo "$REGISTRY_PASSWORD" | docker login registry.kszk.bme.hu --username $REGISTRY_USER --password-stdin -# - cp docker-compose.yml /home/kszk-gitlab-deployer/kszkepzes-prod/ -# - cd /home/kszk-gitlab-deployer/kszkepzes-prod/ -# - docker-compose --no-ansi pull -# - docker-compose up -d -# - docker system prune -f -# variables: -# SSH_HOST: donald.sch.bme.hu # required -# SSH_USER: kszk-gitlab-deployer # default: kszk-gitlab-deployer -# SSH_PORT: 10122 # default: 22 diff --git a/Dockerfile b/Dockerfile index 7e7a5ad6..b7975baf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14 +FROM node:16 WORKDIR /usr/src/app diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml deleted file mode 100644 index 67cd8a9e..00000000 --- a/docker-compose.dev.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: "3.7" -services: - bodysch-backend-dev: - container_name: bodysch-backend-dev - image: registry.kszk.bme.hu/bodysch/backend:dev - restart: always - ports: - - "3030:8000" - links: - - bodysch-mongo-dev - env_file: - - .env - depends_on: - - bodysch-mongo-dev - environment: - NODE_ENV: development - ports: - - 8000:8000 - command: npm run start-dev - - bodysch-mongo-dev: - image: mongo - expose: - - "27017" -- GitLab