Skip to content

Commit

Permalink
Merge pull request #9 from abbgrade/release/1.7.0
Browse files Browse the repository at this point in the history
Release/1.7.0
  • Loading branch information
abbgrade authored Mar 26, 2022
2 parents fcbbd24 + 5bc6894 commit 52852b7
Show file tree
Hide file tree
Showing 51 changed files with 564 additions and 339 deletions.
67 changes: 0 additions & 67 deletions .appveyor.yml

This file was deleted.

60 changes: 60 additions & 0 deletions .build.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<#
.Synopsis
Build script <https://github.com/nightroman/Invoke-Build>
.Example
# Create module from source.
Invoke-Build Build
.Example
# Add doc templates for new command.
# BE CAREFUL! Existing documents will be overwritten and must be discarded using git.
Invoke-Build Doc.Init -ForceDocInit
#>

param(
[string] $NuGetApiKey = $env:nuget_apikey,

# Overwrite published versions
[switch] $ForcePublish,

# Add doc templates for new command.
[switch] $ForceDocInit,

# Version suffix to prereleases
[int] $BuildNumber
)

$ModuleName = 'psdocker'

. $PSScriptRoot\Tasks\Dependencies.Tasks.ps1
. $PSScriptRoot\Tasks\Build.Tasks.ps1

# Synopsis: Default task.
task . Build

task UpdateBuildTasks {
Invoke-WebRequest `
-Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/Powershell/Build.Tasks.ps1' `
-OutFile "$PSScriptRoot\Tasks\Build.Tasks.ps1"
}

task UpdateValidationWorkflow {
Invoke-WebRequest `
-Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/GitHub/build-validation-matrix.yml' `
-OutFile "$PSScriptRoot\.github\workflows\build-validation.yml"
}

task UpdatePreReleaseWorkflow {
Invoke-WebRequest `
-Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/GitHub/pre-release-windows.yml' `
-OutFile "$PSScriptRoot\.github\workflows\pre-release.yml"
}

task UpdateReleaseWorkflow {
Invoke-WebRequest `
-Uri 'https://raw.githubusercontent.com/abbgrade/PsBuildTasks/main/GitHub/release-windows.yml' `
-OutFile "$PSScriptRoot\.github\workflows\release.yml"
}

task UpdatePsBuildTasks -Jobs UpdateBuildTasks, UpdateValidationWorkflow, UpdatePreReleaseWorkflow, UpdateReleaseWorkflow
9 changes: 9 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.224.3/containers/ubuntu/.devcontainer/base.Dockerfile

# [Choice] Ubuntu version (use hirsuite or bionic on local arm64/Apple Silicon): hirsute, focal, bionic
ARG VARIANT="hirsute"
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}

# [Optional] Uncomment this section to install additional OS packages.
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends git-flow
31 changes: 31 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.224.3/containers/ubuntu
{
"name": "Ubuntu",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic
// Use hirsute or bionic on local arm64/Apple Silicon.
"args": { "VARIANT": "focal" }
},

// Set *default* container specific settings.json values on container create.
"settings": {},


// Add the IDs of extensions you want installed when the container is created.
"extensions": [],

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "uname -a; pwsh -Command 'Set-PSRepository PSGallery -InstallationPolicy Trusted; Install-Module InvokeBuild -Confirm:$false; Invoke-Build InstallBuildDependencies, InstallTestDependencies'",

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
"docker-from-docker": "latest",
"powershell": "latest"
}
}
9 changes: 9 additions & 0 deletions .github/workflows/build-validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
on:
push:
branches: [ develop, bugfix/*, feature/*, release/* ]
pull_request:
branches: [ develop ]

jobs:
build-validation:
uses: abbgrade/PsBuildTasks/.github/workflows/[email protected]
66 changes: 0 additions & 66 deletions .github/workflows/main.yml

This file was deleted.

12 changes: 12 additions & 0 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
on:
push:
branches: [ release/* ]
workflow_dispatch:

jobs:
pre-release:
uses: abbgrade/PsBuildTasks/.github/workflows/[email protected]
with:
module-name: psdocker
secrets:
ps-gallery-key: ${{ secrets.PS_GALLERY_KEY }}
12 changes: 12 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
on:
push:
branches: [ main ]
workflow_dispatch:

jobs:
release:
uses: abbgrade/PsBuildTasks/.github/workflows/[email protected]
with:
module-name: psdocker
secrets:
ps-gallery-key: ${{ secrets.PS_GALLERY_KEY }}
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
.vscode/launch.json
/script
/build
publish
10 changes: 10 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"recommendations": [
"eamodio.gitlens",
"editorconfig.editorconfig",
"ms-azuretools.vscode-docker",
"ms-vscode-remote.remote-containers",
"ms-vscode.powershell",
"vector-of-bool.gitflow",
]
}
6 changes: 4 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
// When enabled, will trim trailing whitespace when you save a file.
"files.trimTrailingWhitespace": true
"cSpell.language": "en",
"cSpell.words": [
"commandlet"
]
}
9 changes: 1 addition & 8 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@
"command": "Invoke-Build Build",
"problemMatcher": []
},
{
"label": "Rebuild",
"type": "shell",
"group": "build",
"command": "Invoke-Build Clean, Build",
"problemMatcher": []
},
{
"label": "Clean",
"type": "shell",
Expand Down Expand Up @@ -73,7 +66,7 @@
"-Output", "Detailed"
],
"options": {
"cwd": "test"
"cwd": "${workspaceFolder}/test"
},
"problemMatcher": "$msCompile",
"presentation": {
Expand Down
69 changes: 69 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.7.0] - 2022-02-26

### Added

- Linux support.

## [1.6.0] - 2021-12-19

### Added

- Added `-Remove` parameter to New-Container.

### Changed

- Fixed timeout issue.

## [1.5.0] - 2019-11-02

### Added

- Added argument completions for image name, tag, repository, container name.

### Changed

- Adopted changes from the Docker CLI.

## [1.4.0] - 2019-03-02

### Changed

- Fixed output issue with volumes.
- Fixed pipeline processing with multiple items.
- Fixed ErrorAction parameter.
- Unit test refactoring.

## [1.3.0] - 2019-02-24

### Added

- Support for Linux clients.
- Support for Linux containers.
- Support von container volumes.

### Changed

- Refactoring.

## [1.2.0] - 2019-02-23

### Added

- Pipeline support for the commandlet.
- New cmdlet Uninstall-Image.
- Types for Image, Repository and Container used as output.

### Changed

- Refactoring.

<!-- markdownlint-configure-file {"MD024": { "siblings_only": true } } -->
Loading

0 comments on commit 52852b7

Please sign in to comment.