Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set PATH in Dockerfile Instead of Clone Script #42

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .drone.starlark
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def main(ctx):
linux('amd64'),
windows('1903'),
windows('1809'),
windows('2022'),
]

after = manifest()
Expand Down
33 changes: 33 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,38 @@ steps:
- push
- tag

---
kind: pipeline
type: ssh
name: windows-2022-amd64

platform:
os: windows

server:
host:
from_secret: windows_server_2022
password:
from_secret: windows_password
user:
from_secret: windows_username

steps:
- name: build
commands:
- docker login -u $env:USERNAME -p $env:PASSWORD
- docker build -f docker/Dockerfile.windows.2022 -t drone/git:windows-2022-amd64 .
- docker push drone/git:windows-2022-amd64
environment:
USERNAME:
from_secret: docker_username
PASSWORD:
from_secret: docker_password

trigger:
event:
- push

---
kind: pipeline
type: ssh
Expand Down Expand Up @@ -221,6 +253,7 @@ depends_on:
- linux-amd64
- linux-arm64
- linux-arm
- windows-2022-amd64
- windows-1909-amd64
- windows-1903-amd64
- windows-1809-amd64
15 changes: 15 additions & 0 deletions docker/Dockerfile.windows.2022
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# escape=`

FROM mcr.microsoft.com/powershell:nanoserver-ltsc2022

RUN `
mkdir tmp && mkdir git`
&& curl -sSfLo tmp/file.zip https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-64-bit.zip `
&& tar -C c:\git -oxzf tmp/file.zip`
&& rmdir /Q /S tmp

RUN setx PATH "%PATH%;/git/cmd;/git/mingw64/bin;/git/usr/bin"

ADD windows/* /bin/

CMD ["pwsh", "/bin/clone.ps1"]
8 changes: 7 additions & 1 deletion docker/manifest.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,10 @@ manifests:
platform:
architecture: amd64
os: windows
version: 1909
version: 1909
-
image: drone/git:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-2022-amd64
platform:
architecture: amd64
os: windows
version: 2022
4 changes: 0 additions & 4 deletions windows/clone.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
$ErrorActionPreference = 'Stop';

# HACK: no clue how to set the PATH inside the Dockerfile,
# so am setting it here instead. This is not idea.
$Env:PATH += ';C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin'

# if the workspace is set we should make sure
# it is the current working directory.

Expand Down