Skip to content

Commit

Permalink
Fix: Consistently indent with 2 spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@localheinz @alcohol
localheinz authored and alcohol committed Sep 3, 2023
1 parent f7443a9 commit 1a34df8
Show file tree
Hide file tree
Showing 3 changed files with 190 additions and 190 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/shellcheck.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
pull_request: null
push:
paths:
- .github/workflows/shellcheck.yaml
- '**.sh'
- .github/workflows/shellcheck.yaml
- '**.sh'

jobs:
shellcheck:
name: ShellCheck
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: ShellCheck
run: find . -type f -name '*.sh' | grep -v generate-stackbrew-library | xargs shellcheck
- name: Checkout
uses: actions/checkout@v2
- name: ShellCheck
run: find . -type f -name '*.sh' | grep -v generate-stackbrew-library | xargs shellcheck
124 changes: 62 additions & 62 deletions .github/workflows/v1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
pull_request: null
push:
paths:
- .github/workflows/v1.yaml
- '1.10/**'
- .github/workflows/v1.yaml
- '1.10/**'

env:
AWS_REGION: us-east-1
Expand All @@ -20,63 +20,63 @@ jobs:
run:
working-directory: '1.10'
steps:
- uses: actions/checkout@v3
# Build full image: binary with runtime
- name: Build full image
run: |
docker build \
--pull \
--no-cache \
--target binary-with-runtime \
--tag composer/composer:1 \
--tag composer/composer:1.10 \
--tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+') \
.
# Build low-size image with binary only
- name: Build binary-only image
run: |
docker build \
--pull \
--no-cache \
--target standalone-binary \
--tag composer/composer:1-bin \
--tag composer/composer:1.10-bin \
--tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin \
.
- name: Login to Docker Hub
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Push tag(s) to Docker Hub
if: github.ref == 'refs/heads/main'
run: |
docker push composer/composer:1
docker push composer/composer:1-bin
docker push composer/composer:1.10
docker push composer/composer:1.10-bin
docker push composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')
docker push composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin
- name: Login to Amazon Public ECR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v1
with:
registry: public.ecr.aws
username: ${{ secrets.AWS_ECR_ACCESS_KEY }}
password: ${{ secrets.AWS_ECR_SECRET_KEY }}
- name: Push tag(s) to Amazon Public ECR
if: github.ref == 'refs/heads/main'
run: |
docker tag composer/composer:1 $ECR_REPO:1
docker tag composer/composer:1-bin $ECR_REPO:1-bin
docker tag composer/composer:1.10 $ECR_REPO:1.10
docker tag composer/composer:1.10-bin $ECR_REPO:1.10-bin
docker tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+') $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')
docker tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin
docker push $ECR_REPO:1
docker push $ECR_REPO:1-bin
docker push $ECR_REPO:1.10
docker push $ECR_REPO:1.10-bin
docker push $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')
docker push $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin
- uses: actions/checkout@v3
# Build full image: binary with runtime
- name: Build full image
run: |
docker build \
--pull \
--no-cache \
--target binary-with-runtime \
--tag composer/composer:1 \
--tag composer/composer:1.10 \
--tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+') \
.
# Build low-size image with binary only
- name: Build binary-only image
run: |
docker build \
--pull \
--no-cache \
--target standalone-binary \
--tag composer/composer:1-bin \
--tag composer/composer:1.10-bin \
--tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin \
.
- name: Login to Docker Hub
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Push tag(s) to Docker Hub
if: github.ref == 'refs/heads/main'
run: |
docker push composer/composer:1
docker push composer/composer:1-bin
docker push composer/composer:1.10
docker push composer/composer:1.10-bin
docker push composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')
docker push composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin
- name: Login to Amazon Public ECR
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v1
with:
registry: public.ecr.aws
username: ${{ secrets.AWS_ECR_ACCESS_KEY }}
password: ${{ secrets.AWS_ECR_SECRET_KEY }}
- name: Push tag(s) to Amazon Public ECR
if: github.ref == 'refs/heads/main'
run: |
docker tag composer/composer:1 $ECR_REPO:1
docker tag composer/composer:1-bin $ECR_REPO:1-bin
docker tag composer/composer:1.10 $ECR_REPO:1.10
docker tag composer/composer:1.10-bin $ECR_REPO:1.10-bin
docker tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+') $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')
docker tag composer/composer:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin
docker push $ECR_REPO:1
docker push $ECR_REPO:1-bin
docker push $ECR_REPO:1.10
docker push $ECR_REPO:1.10-bin
docker push $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')
docker push $ECR_REPO:$(grep -oP 'COMPOSER_VERSION 1.10.\d+' Dockerfile | grep -oP '1.10.\d+')-bin
Loading

0 comments on commit 1a34df8

Please sign in to comment.