diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9136442..b71396d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - build # - test - - deploy + - review build_ui: image: node @@ -23,62 +23,81 @@ build_ui: - build - conf - index.html + - Dockerfile + - docker-compose.yml + + +#start_review: +# image: mwienk/docker-lftp +# tags: +# - docker +# dependencies: +# - build_ui +# stage: deploy +# script: +# - cat index.html +# - mkdir _for_upload +# - mv assets build conf index.html _for_upload +# - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v -n -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" +# environment: +# name: review/$CI_COMMIT_REF_NAME +# url: http://ui.basispanel.de/$CI_COMMIT_REF_NAME/ +# on_stop: stop_review +# +#stop_review: +# image: mwienk/docker-lftp +# tags: +# - docker +# stage: deploy +# variables: +# GIT_STRATEGY: none +# script: +# - echo stopping env +# environment: +# name: review/$CI_COMMIT_REF_NAME +# action: stop +# when: manual +# +# +# +#fullsync_review: +# image: mwienk/docker-lftp +# tags: +# - docker +# dependencies: +# - build_ui +# stage: deploy +# script: +# - mkdir _for_upload +# - mv assets build conf index.html _for_upload +# - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v --transfer-all -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" +# when: manual start_review: - image: mwienk/docker-lftp - tags: - - docker - dependencies: - - build_ui - stage: deploy - script: - - cat index.html - - mkdir _for_upload - - mv assets build conf index.html _for_upload - - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v -n -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" - environment: - name: review/$CI_COMMIT_REF_NAME - url: http://ui.basispanel.de/$CI_COMMIT_REF_NAME/ - on_stop: stop_review - -stop_review: - image: mwienk/docker-lftp - tags: - - docker - stage: deploy - variables: - GIT_STRATEGY: none - script: - - echo stopping env - environment: - name: review/$CI_COMMIT_REF_NAME - action: stop - when: manual - - - -fullsync_review: - image: mwienk/docker-lftp - tags: - - docker - dependencies: - - build_ui - stage: deploy - script: - - mkdir _for_upload - - mv assets build conf index.html _for_upload - - lftp -c "set sftp:auto-confirm yes; open -u intern_basispanel_ui,$FTP_PASSWORD sftp://ftp.basehosts.de;mkdir -f /$CI_COMMIT_REF_NAME; mirror -v --transfer-all -e -R -L _for_upload/ /$CI_COMMIT_REF_NAME" - when: manual - - -docker_test: tags: - shell dependencies: - build_ui - stage: deploy + stage: review script: - mkdir _for_docker - mv assets build conf index.html _for_docker - - docker-compose up -d --build + - docker-compose -p ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} up -d --build + environment: + name: review/$CI_COMMIT_REF_NAME + url: http://${CI_COMMIT_REF_NAME}.${CI_PROJECT_NAME}.dev.basehosts.de/ + on_stop: stop_review + +stop_review: + tags: + - shell + variables: + GIT_STRATEGY: none + stage: review + when: manual + script: + - docker-compose -p ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} down + environment: + name: review/$CI_COMMIT_REF_NAME + action: stop diff --git a/README.md b/README.md index b2d7d77..6e5a114 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ [![pipeline status](https://git.basehosts.de:20443/panel/basispanel-ui/badges/master/pipeline.svg)](https://git.basehosts.de:20443/panel/basispanel-ui/commits/master) # basispanel UI + + ## Entwicklungsprozess ### Allgemeines diff --git a/docker-compose.yml b/docker-compose.yml index 9248f2b..ddb0e23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,6 @@ services: frontend: build: . image: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} - container_name: ${CI_PROJECT_NAME}_${CI_COMMIT_REF_NAME} restart: always networks: - web diff --git a/index.html b/index.html index 7192501..e1471f4 100644 --- a/index.html +++ b/index.html @@ -8,9 +8,9 @@
- +
Lade, bitte warten...
- + \ No newline at end of file diff --git a/src/components/my-form.vue b/src/components/my-form.vue index e299e56..7bc2909 100644 --- a/src/components/my-form.vue +++ b/src/components/my-form.vue @@ -23,7 +23,6 @@ \ No newline at end of file diff --git a/src/components/topbar.vue b/src/components/topbar.vue index d5d4d38..4e80d22 100644 --- a/src/components/topbar.vue +++ b/src/components/topbar.vue @@ -12,7 +12,7 @@