Skip to content
Merged
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
48 changes: 24 additions & 24 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ jobs:
env:
AZURE_KEY_VAULT_CLIENT_SECRET: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
run: dotnet build src/Setup --configuration Release
- name: Build Docker images
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
run: dotnet build src/ServiceControl.DockerImages --configuration Release
- name: List Docker images
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
shell: pwsh
run: docker images
# - name: Build Docker images
# if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
# run: dotnet build src/ServiceControl.DockerImages --configuration Release
# - name: List Docker images
# if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
# shell: pwsh
# run: docker images
- name: Publish assets
uses: actions/upload-artifact@v3.1.3
with:
Expand Down Expand Up @@ -146,20 +146,20 @@ jobs:
with:
octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
additional-metadata-paths: ServiceControlMetadata.json
- name: Login to Docker Hub
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
uses: docker/login-action@v3.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push Docker images
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
shell: pwsh
run: |
Get-ChildItem -Path dockerfiles -Filter *.dockerfile | ForEach-Object {
$dockerImageName = $_.Name.SubString(0, $_.Name.Length - ".dockerfile".Length);
$dockerpushcmd = "docker push particular/" + $dockerImageName +":${{ env.MinVerVersion }}"
echo "Docker Push Command: $dockerpushcmd"
Invoke-Expression $dockerpushcmd.ToLower()
}
# - name: Login to Docker Hub
# if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
# uses: docker/login-action@v3.0.0
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_TOKEN }}
# - name: Push Docker images
# if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
# shell: pwsh
# run: |
# Get-ChildItem -Path dockerfiles -Filter *.dockerfile | ForEach-Object {
# $dockerImageName = $_.Name.SubString(0, $_.Name.Length - ".dockerfile".Length);
#
# $dockerpushcmd = "docker push particular/" + $dockerImageName +":${{ env.MinVerVersion }}"
# echo "Docker Push Command: $dockerpushcmd"
# Invoke-Expression $dockerpushcmd.ToLower()
# }
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@

</ItemGroup>

<Target Name="CleanGeneratedDockerfiles" AfterTargets="Build">
<!-- NOTE: this should be re-enabled after ServiceControl can be run on Linux -->
<!--<Target Name="CleanGeneratedDockerfiles" AfterTargets="Build">-->
<Target Name="CleanGeneratedDockerfiles">
<ItemGroup>
<Dockerfiles Include="$(DockerfilesFolder)*.dockerfile" />
</ItemGroup>
Expand Down