Merge pull request #28 from tphoney/windows_2022

(feat) adding windows ltsc2022
harness · Apr 17, 2023 · 12cfd6f · 12cfd6f
2 parents e56ef4a + bc635ae
commit 12cfd6f
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 16 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -27,7 +27,6 @@ platform:
 
 steps:
   - name: build-push
-    pull: always
     image: golang:1.18
     commands:
       - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/amd64/plugin'
@@ -39,7 +38,6 @@ steps:
           - tag
 
   - name: build-tag
-    pull: always
     image: golang:1.18
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/amd64/plugin'
@@ -50,7 +48,6 @@ steps:
         - tag
 
   - name: publish
-    pull: always
     image: plugins/docker:linux-amd64
     settings:
       auto_tag: true
@@ -78,6 +75,7 @@ depends_on:
 ---
 kind: pipeline
 name: linux-arm64
+type: vm
 pool:
   use: ubuntu_arm64
 
@@ -87,7 +85,6 @@ platform:
 
 steps:
   - name: build-push
-    pull: always
     image: golang:1.18
     commands:
       - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/arm64/plugin'
@@ -99,7 +96,6 @@ steps:
           - tag
 
   - name: build-tag
-    pull: always
     image: golang:1.18
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/arm64/plugin'
@@ -110,7 +106,6 @@ steps:
         - tag
 
   - name: publish
-    pull: always
     image: plugins/docker:linux-arm64
     settings:
       auto_tag: true
@@ -148,7 +143,6 @@ platform:
 
 steps:
   - name: build-push
-    pull: always
     image: golang:1.18
     commands:
       - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/windows/amd64/plugin'
@@ -159,7 +153,6 @@ steps:
         exclude:
           - tag
   - name: build-tag
-    pull: always
     image: golang:1.18
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -o release/windows/amd64/plugin'
@@ -169,7 +162,6 @@ steps:
       event:
         - tag
   - name: publish
-    pull: always
     image: plugins/docker@sha256:f0233d950ae87ee6cb5500b2d5497fe02aa338201c0bdce2619f443fd174cfa4
     settings:
       auto_tag: true
@@ -194,6 +186,62 @@ trigger:
     - refs/tags/**
     - "refs/pull/**"
 
+---
+kind: pipeline
+type: vm
+name: windows-ltsc2022-amd64
+
+pool:
+  use: windows-2022
+
+platform:
+  os: windows
+
+steps:
+  - name: build-push
+    image: golang:1.18
+    commands:
+      - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/windows/amd64/plugin'
+    environment:
+      CGO_ENABLED: 0
+    when:
+      event:
+        exclude:
+          - tag
+  - name: build-tag
+    image: golang:1.18
+    commands:
+      - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -o release/windows/amd64/plugin'
+    environment:
+      CGO_ENABLED: 0
+    when:
+      event:
+        - tag
+  - name: publish
+    image: plugins/docker@sha256:f0233d950ae87ee6cb5500b2d5497fe02aa338201c0bdce2619f443fd174cfa4
+    settings:
+      auto_tag: true
+      auto_tag_suffix: windows-ltsc2022-amd64
+      dockerfile: docker/Dockerfile.windows.amd64.ltsc2022
+      password:
+        from_secret: docker_password
+      repo: plugins/artifactory
+      username:
+        from_secret: docker_username
+    when:
+      event:
+        exclude:
+          - pull_request
+
+depends_on:
+  - testing
+
+trigger:
+  ref:
+    - refs/heads/main
+    - refs/tags/**
+    - "refs/pull/**"
+
 ---
 kind: pipeline
 name: notifications
@@ -208,7 +256,6 @@ platform:
 
 steps:
   - name: manifest
-    pull: always
     image: plugins/manifest
     settings:
       ignore_missing: "true"
@@ -228,3 +275,4 @@ depends_on:
   - linux-amd64
   - linux-arm64
   - windows-1809-amd64
+  - windows-ltsc2022-amd64
diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64
@@ -10,7 +10,7 @@ COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 RUN apk add --update \
     curl \
     && rm -rf /var/cache/apk/*
-RUN curl -fL https://getcli.jfrog.io/v2-jf | sh /dev/stdin 2.18.2
+RUN curl -fL https://getcli.jfrog.io/v2-jf | sh /dev/stdin 2.36.1
 RUN mv ./jf /usr/local/bin/jfrog
 RUN chmod +x /usr/local/bin/jfrog
 

diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64
@@ -11,9 +11,9 @@ COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 RUN apk add --update \
     curl \
     && rm -rf /var/cache/apk/*
-RUN curl -fL https://getcli.jfrog.io | sh /dev/stdin 1.35.5
+RUN curl -fL https://getcli.jfrog.io | sh /dev/stdin 2.36.1
 RUN mv ./jfrog /usr/local/bin/
 RUN chmod +x /usr/local/bin/jfrog
 
 ADD release/linux/arm64/plugin /bin/
-ENTRYPOINT ["/bin/plugin"]
+ENTRYPOINT ["/bin/plugin"]
diff --git a/docker/Dockerfile.windows.amd64.1809 b/docker/Dockerfile.windows.amd64.1809
@@ -6,7 +6,7 @@ USER ContainerAdministrator
 
 ENV GODEBUG=netdns=go
 RUN mkdir /bin
-RUN Invoke-WebRequest https://releases.jfrog.io/artifactory/jfrog-cli/v2/2.10.0/jfrog-cli-windows-amd64/jfrog.exe -OutFile C:/bin/jfrog.exe
+RUN Invoke-WebRequest https://releases.jfrog.io/artifactory/jfrog-cli/v2/2.36.1/jfrog-cli-windows-amd64/jfrog.exe -OutFile C:/bin/jfrog.exe
 ADD release/windows/amd64/plugin C:/bin/drone-artifactory.exe
 
-ENTRYPOINT [ "C:\\bin\\drone-artifactory.exe" ]
+ENTRYPOINT [ "C:\\bin\\drone-artifactory.exe" ]
diff --git a/docker/Dockerfile.windows.amd64.ltsc2022 b/docker/Dockerfile.windows.amd64.ltsc2022
@@ -0,0 +1,12 @@
+# escape=`
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+USER ContainerAdministrator
+
+ENV GODEBUG=netdns=go
+RUN mkdir /bin
+RUN Invoke-WebRequest https://releases.jfrog.io/artifactory/jfrog-cli/v2/2.36.1/jfrog-cli-windows-amd64/jfrog.exe -OutFile C:/bin/jfrog.exe
+ADD release/windows/amd64/plugin C:/bin/drone-artifactory.exe
+
+ENTRYPOINT [ "C:\\bin\\drone-artifactory.exe" ]
diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl
@@ -22,4 +22,10 @@ manifests:
     platform:
       architecture: amd64
       os: windows
-      version: 1809
+      version: 1809
+  -
+    image: plugins/artifactory:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64
+    platform:
+      architecture: amd64
+      os: windows
+      version: ltsc2022