Try to build Docker image for Pull Requests

Add missing trailing slash
Merge pull request '♻️ Optimize Dockerfile' (!85 ) from optimize-dockerfile into main
2024-04-23 22:48:01 +02:00 · 2024-04-23 22:47:54 +02:00 · 2024-04-23 22:26:14 +02:00 · 2024-02-20 20:26:54 +01:00 · 2024-01-12 18:42:27 +01:00 · 2023-12-10 18:47:54 +01:00
5 changed files with 40 additions and 26 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +1,11 @@
+.browserslistrc
+.dockerignore
+.drone.yml
+.editorconfig
 .git
+.gitignore
+.reuse
+Dockerfile
+LICENSES
+README.md
 node_modules
--- a/.drone.yml
+++ b/.drone.yml
@ -21,6 +21,13 @@ steps:
    commands:
      - npm ci
      - npm run lint
+  - name: docker-build
+    image: plugins/docker
+    settings:
+      registry: git.wtf-eg.de
+      repo: git.wtf-eg.de/kompetenzinventar/frontend
+      target: ki-frontend
+      dry_run: true

 ---
 kind: pipeline
--- a/16
+++ b/16
@ -4,17 +4,25 @@

 FROM node:14-alpine as builder

-COPY . ./
+COPY package.json package-lock.json ./
+RUN npm install
+
+COPY .eslintrc.js .
+COPY babel.config.js .
+COPY public public
+COPY src src

 RUN npm ci && npm run build


 FROM nginx as ki-frontend

-COPY --from=builder /dist/ /usr/share/nginx/html/
-COPY etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
-
 LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-frontend.git
 LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-frontend
 LABEL org.opencontainers.image.documentation=https://git.wtf-eg.de/kompetenzinventar/ki-frontend#docker
 LABEL org.opencontainers.image.vendor="WTF Kooperative eG"
+
+WORKDIR /usr/share/nginx/html
+
+COPY etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=builder /dist .
--- a/src/mixins/request.mixin.js
+++ b/src/mixins/request.mixin.js
@ -95,10 +95,11 @@ export default {
        console.error(error);
      }
    },
-    async submitFormEdit() {
+    async submitFormEdit(isProfileVisible) {
      this.showErrorMessage = false
      this.showSuccessMessage = false
      const userId = store.state.currentUserId
+      this.profile.visible = isProfileVisible;

      try {
        const body = JSON.stringify(this.profile)
--- a/src/views/profile/Edit.vue
+++ b/src/views/profile/Edit.vue
@ -12,25 +12,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
      </div>
    </div>
    <div class="container">
-      <form @submit.prevent="submitFormEdit()">
+      <form @submit.prevent="submitFormEdit(false)">
        <Section title="Grunddaten">
-          <div class="mb-4">
-            <div class="form-check form-switch">
-              <input
-                class="form-check-input"
-                type="checkbox"
-                role="switch"
-                v-model="profile.visible"
-                id="visibility"
-              >
-              <label
-                class="form-check-label"
-                for="visibility">
-                Profil für angemeldete Benutzer sichtbar
-              </label>
-            </div>
-          </div>
-
          <div class="row mb-4">
            <div class="col-12 col-md-4 mb-3 mb-md-0">
              <label class="form-label">Nickname</label>
@ -223,10 +206,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
              Gespeichert
            </div>
            <button
-              class="btn btn-primary ms-3"
-              @click="submitFormEdit()"
+              class="btn btn-secondary ms-3"
+              @click="submitFormEdit(false)"
            >
-              Speichern
+              Entwurf Speichern
+            </button>
+            <button
+              class="btn btn-primary ms-3"
+              @click="submitFormEdit(true)"
+            >
+              Speichern und Veröffentlichen
            </button>
          </div>
        </div>
Author	SHA1	Message	Date
Brain	81dcf5ebe7	Try to build Docker image for Pull Requests All checks were successful continuous-integration/drone/pr Build is passing Details	2024-04-23 22:48:01 +02:00
Brain	7433d25716	Add missing trailing slash	2024-04-23 22:47:54 +02:00
Brain	7feee07d35	Merge pull request '♻️ Optimize Dockerfile' (!85 ) from optimize-dockerfile into main Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #85 Reviewed-by: srsh <srsh@noreply.git.wtf-eg.de>	2024-04-23 22:26:14 +02:00
Nikolai Gotzmann	c79ada2123	ISSUE-58\| Move profile visiblity (!87 ) All checks were successful continuous-integration/drone/push Build is passing Details Move switch profile visibility button to save bar Rename Save button to save as draft and offer save and publish Fixes kompetenzinventar/ki-doku#58 Reviewed-on: #87 Reviewed-by: srsh <srsh@noreply.git.wtf-eg.de> Co-authored-by: Nikolai Gotzmann <self@ngotzmann.net> Co-committed-by: Nikolai Gotzmann <self@ngotzmann.net>	2024-02-20 20:26:54 +01:00
Mic Szillat	f8e78d1cc8	♻️ Optimize Dockerfile All checks were successful continuous-integration/drone/pr Build is passing Details - add all non-essential files to .dockerignore - improve cachability by layers - re-order lines to reduce layer generation	2024-01-12 18:42:27 +01:00
jaschop	c2552f3c3a	Merge pull request 'Push image to Gitea registry' (!84 ) from gitea-registry into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #84	2023-12-10 18:47:54 +01:00