Skip to content

Commit

Permalink
Remove version folder
Browse files Browse the repository at this point in the history
  • Loading branch information
henryju committed May 17, 2024
1 parent a1f2263 commit 718170b
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ env:

# Staging image configuration
STAGING_IMAGE_NAME: sonarsource/sonarqube
CURRENT_MAJOR_VERSION: "5"
CURRENT_TAG: scanner-5.0.1

vm_instance_template: &VM_TEMPLATE
Expand All @@ -39,7 +38,7 @@ multi_arch_build_task:
- docker buildx inspect --bootstrap
build_script:
- echo "Build the ${STAGING_IMAGE_NAME}:${CURRENT_TAG} image supporting two architectures, linux/amd64"
- docker buildx build --platform linux/amd64 --tag "${STAGING_IMAGE_NAME}:${CURRENT_TAG}" --push "${CURRENT_MAJOR_VERSION}"
- docker buildx build --platform linux/amd64 --tag "${STAGING_IMAGE_NAME}:${CURRENT_TAG}" --push .

private_scan_task:
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hadolint-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ jobs:
- name: Pull HaDoLint image
run: docker pull hadolint/hadolint
- name: Lint Dockerfile
run: docker run --rm --interactive hadolint/hadolint hadolint --ignore DL3018 --ignore DL4001 --ignore DL3013 --ignore SC2015 --ignore DL3008 - < ./5/Dockerfile
run: docker run --rm --interactive hadolint/hadolint hadolint --ignore DL3018 --ignore DL4001 --ignore DL3013 --ignore SC2015 --ignore DL3008 - < ./Dockerfile
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
path: target_repository
- name: Build image
run: |
docker build "${{ steps.get_version.outputs.major_version }}" \
docker build . \
--tag "sonarsource/sonar-scanner-cli:${{ steps.get_version.outputs.major_version }}" \
--tag "repox-sonarsource-docker-releases.jfrog.io/sonarsource/sonar-scanner-cli:${{ steps.get_version.outputs.major_version }}" \
--tag "sonarsource/sonar-scanner-cli:${{ steps.get_version.outputs.major_minor }}" \
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
sonar.organization=sonarsource
sonar.projectKey=SonarSource_sonar-scanner-cli-docker_AYc24KKjsMmHG0qPXLZ9
sonar.sources=5/
sonar.sources=.

0 comments on commit 718170b

Please sign in to comment.