Skip to content

Commit

Permalink
Remove attestation
Browse files Browse the repository at this point in the history
  • Loading branch information
ostefano committed Dec 7, 2023
1 parent 7089a87 commit 98ba9c3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/release-latest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build the Docker images and push them to Docker Hub
name: Build the Docker images and push them to the container registry

on:
push:
Expand Down Expand Up @@ -27,10 +27,10 @@ jobs:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: |
sed -e '/^[[:space:]]*$/d' -e '/[#@]/d' -e 's/\"//g' -e 's/\(^[^=]*\)=\(.*\)/\1="\2"/' template.env > env.hcl
echo "DOCKER_IMG_TAG=`echo '${{ github.sha }}' | cut -c 1-7`" >> "$GITHUB_ENV"
echo "DOCKER_USERNAME=ghcr.io/misp/misp-docker" >> "$GITHUB_ENV"
echo "COMMIT_HASH=`echo '${{ github.sha }}' | cut -c 1-7`" >> "$GITHUB_ENV"
echo "NAMESPACE=ghcr.io/misp/misp-docker" >> "$GITHUB_ENV"
- name: Log in to the Container registry
- name: Log in to the container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
Expand All @@ -41,4 +41,5 @@ jobs:
uses: docker/bake-action@v4
with:
push: true
provenance: false
files: docker-bake.hcl, env.hcl
5 changes: 3 additions & 2 deletions .github/workflows/test-build-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ jobs:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: |
sed -e '/^[[:space:]]*$/d' -e '/[#@]/d' -e 's/\"//g' -e 's/\(^[^=]*\)=\(.*\)/\1="\2"/' template.env > env.hcl
echo "DOCKER_IMG_TAG=`echo '${{ github.sha }}' | cut -c 1-7`" >> "$GITHUB_ENV"
echo "DOCKER_USERNAME=local" >> "$GITHUB_ENV"
echo "COMMIT_HASH=`echo '${{ github.sha }}' | cut -c 1-7`" >> "$GITHUB_ENV"
echo "NAMESPACE=local" >> "$GITHUB_ENV"
- name: Build
uses: docker/bake-action@v4
with:
push: false
rovenance: false
files: docker-bake.hcl, env.hcl
8 changes: 4 additions & 4 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ variable "PYPI_PYMISP_VERSION" {
default = ""
}

variable "DOCKER_USERNAME" {
variable "NAMESPACE" {
default = null
}

variable "DOCKER_IMG_TAG" {
variable "COMMIT_HASH" {
default = null
}

Expand Down Expand Up @@ -80,7 +80,7 @@ group "default" {
target "misp-modules" {
context = "modules/."
dockerfile = "Dockerfile"
tags = flatten(["${DOCKER_USERNAME}/misp-docker:modules-latest", "${DOCKER_USERNAME}/misp-docker:modules-${DOCKER_IMG_TAG}", MODULES_TAG != "" ? ["${DOCKER_USERNAME}/misp-docker:modules-${MODULES_TAG}"] : []])
tags = flatten(["${NAMESPACE}/misp-docker:modules-latest", "${NAMESPACE}/misp-docker:modules-${COMMIT_HASH}", MODULES_TAG != "" ? ["${NAMESPACE}/misp-docker:modules-${MODULES_TAG}"] : []])
args = {
"MODULES_TAG": "${MODULES_TAG}",
"MODULES_COMMIT": "${MODULES_COMMIT}",
Expand All @@ -92,7 +92,7 @@ target "misp-modules" {
target "misp" {
context = "server/."
dockerfile = "Dockerfile"
tags = flatten(["${DOCKER_USERNAME}/misp-docker:core-latest", "${DOCKER_USERNAME}/misp-docker:core-${DOCKER_IMG_TAG}", MISP_TAG != "" ? ["${DOCKER_USERNAME}/misp-docker:core-${MISP_TAG}"] : []])
tags = flatten(["${NAMESPACE}/misp-docker:core-latest", "${NAMESPACE}/misp-docker:core-${COMMIT_HASH}", MISP_TAG != "" ? ["${NAMESPACE}/misp-docker:core-${MISP_TAG}"] : []])
args = {
"MISP_TAG": "${MISP_TAG}",
"MISP_COMMIT": "${MISP_COMMIT}",
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
- SYS_NICE # CAP_SYS_NICE Prevent runaway mysql log

misp:
image: ostefano/misp-docker:core-latest
image: ghcr.io/misp/misp-docker/misp-docker:core-latest
build:
context: server/.
args:
Expand Down Expand Up @@ -88,7 +88,7 @@ services:
- "MYSQL_DATABASE=${MYSQL_DATABASE:-misp}"

misp-modules:
image: ostefano/misp-docker:modules-latest
image: ghcr.io/misp/misp-docker/misp-docker:modules-latest
build:
context: modules/.
args:
Expand Down

0 comments on commit 98ba9c3

Please sign in to comment.