Merge pull request 'Develop->main' (#2) from develop into master

Reviewed-on: #2

.drone.yml

@@ -1,9 +1,10 @@
 kind: pipeline
 type: docker
-name: build-test
+name: build-and-push
 
 trigger:
   event:
+    - push
     - pull_request
 
 steps:
@@ -12,18 +13,10 @@ steps:
     settings:
       dockerfile: Dockerfile
       context: .
----
-kind: pipeline
-type: docker
-name: build-and-push
+      when:
+        event:
+          - pull_request
 
-trigger:
-  event:
-    - push
-  branch:
-    - master
-
-steps:
   - name: build-and-push
     image: plugins/docker
     settings:
@@ -31,8 +24,11 @@ steps:
       context: .
       registry: gitea.jambotron.com
       repo: gitea.jambotron.com/liosha84/htop-web
-      tags: ${DRONE_COMMIT_SHA},main-latest
+      tags: ${DRONE_COMMIT_SHA:0:7},main-latest
       username:
         from_secret: REGISTRY_USERNAME
       password:
         from_secret: REGISTRY_PASSWORD
+      when:
+        branch:
+          - main

Dockerfile

@@ -23,7 +23,7 @@ FROM eclipse-temurin:21-jre
 WORKDIR /app
 COPY --from=builder /app/build/libs/backend-0.0.1-SNAPSHOT.jar app.jar
 
-RUN adduser --disabled-password --gecos "" appuser && \
+RUN adduser --disabled-password --no-create-home appuser && \
     chown appuser:appuser /app
 USER appuser