Skip to content

Commit

Permalink
Revert "fix error when running step docker-compose --version: /usr/lo…
Browse files Browse the repository at this point in the history
…cal/bin/docker-compose: Permission denied"

This reverts commit b0a9b53.
  • Loading branch information
Frederic Mercier committed Aug 27, 2024
1 parent b0a9b53 commit c1f31c2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build and test
on: [push]
env:
DOCKER_COMPOSE_VERSION: 1.29.2
ODM_FILE_NAME: odm-for-docker.zip
ODM_VERSION: 8.12.0.0
jobs:
Expand All @@ -14,14 +15,17 @@ jobs:
run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
- run: sudo apt update
- run: sudo apt full-upgrade
- name: Get docker-compose
run: sudo curl --insecure --location --output /usr/local/bin/docker-compose --retry 5 --retry-delay 10 https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)
- run: docker-compose --version
- run: docker info
# - run: sh -c "! egrep -ri '(LICENSE[D]?).*(IBM)' --exclude='*.tar.gz' --exclude=.travis.yml --exclude-dir=licenses --exclude=index.jsp --exclude-dir=.git --exclude-dir=.github --exclude=error.jsp --exclude-dir=dockerhub ."
- run: bash build.sh
env:
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
ODM_URL: ${{ secrets.ODM_URL }}
- run: sudo docker compose up -d
- run: sudo docker-compose up -d
- run: sh test/suite.sh
- name: Report Status by slack
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2024-08-27T09:30:15Z",
"generated_at": "2024-08-27T07:49:47Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -82,7 +82,7 @@
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
"is_secret": false,
"is_verified": false,
"line_number": 44,
"line_number": 48,
"type": "Basic Auth Credentials",
"verified_result": null
}
Expand Down

0 comments on commit c1f31c2

Please sign in to comment.