Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dmabry/flowgre
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.4.6
Choose a base ref
...
head repository: dmabry/flowgre
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.4.7
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Jun 20, 2023

  1. Merge pull request #61 from dmabry/feature/update-containers-tools 

    Feature/update containers tools
    @dmabry
    dmabry committed Jun 20, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    dmabry David Mabry
    GPG key ID: A5E60D29E9712BDD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fdb3a8f View commit details

  2. Merge pull request #62 from dmabry/feature/update-containers-tools 

    Merge pull request #61 from dmabry/feature/update-containers-tools
    @dmabry
    dmabry authored Jun 20, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1af54de View commit details

  3. updated version to 0.4.7

    @dmabry
    dmabry committed Jun 20, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    dmabry David Mabry
    GPG key ID: A5E60D29E9712BDD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9fd69ef View commit details
Showing with 17 additions and 17 deletions.
  1. +9 −9 .drone.yml
  2. +2 −2 .nfpm/nfpm-alpine-amd64.yaml
  3. +2 −2 .nfpm/nfpm-linux-amd64.yaml
  4. +3 −3 Dockerfile
  5. +1 −1 flowgre.go
18 changes: 9 additions & 9 deletions .drone.yml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ name: test

steps:
- name: test
image: golang:1.19-alpine3.17
image: golang:alpine
commands:
- apk add --no-cache build-base
- go test -v ./... -count 1
@@ -22,14 +22,14 @@ name: security

steps:
- name: gosec
image: golang:1.19-alpine3.17
image: golang:alpine
commands:
- wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s v2.14.0
- wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s v2.16.0
- ./bin/gosec ./...
- name: trivy
image: golang:1.19-alpine3.17
image: golang:alpine
commands:
- wget -O - -q https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s v0.35.0
- wget -O - -q https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s v0.42.1
- ./bin/trivy fs .
trigger:
event:
@@ -43,12 +43,12 @@ name: release

steps:
- name: build
image: golang:1.19
image: golang:latest
commands:
- bash ./scripts/build-multiplatform.sh ${DRONE_TAG##v}
- ls -l flowgre_*
- name: build-musl
image: golang:1.19-alpine3.17
image: golang:alpine
commands:
- apk add --no-cache build-base
- go build -ldflags '-s -w' -a -o flowgre_linux_amd64_musl_${DRONE_TAG##v}
@@ -63,7 +63,7 @@ steps:
commands:
- nfpm package -p apk -f ./.nfpm/nfpm-alpine-amd64.yaml
- name: generate_sbom
image: golang:1.19-alpine3.17
image: golang:alpine
commands:
- wget -O - -q https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s v0.35.0
- ./bin/trivy fs --format cyclonedx --output sbom_${DRONE_TAG##v}.json .
@@ -88,6 +88,6 @@ depends_on:

---
kind: signature
hmac: 406abfdd165a0c3270a8ed05d95ca78aa000366f008e85aaf3da278c3b6a65a6
hmac: 5361c3bd2e65d3d760b589fbc568bf381f27c537553bb9e7e1a43dda688f3601

...
4 changes: 2 additions & 2 deletions .nfpm/nfpm-alpine-amd64.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "flowgre"
arch: "amd64"
platform: "linux"
version: "v0.4.6"
version: "v0.4.7"
section: "default"
priority: "extra"
provides:
@@ -14,7 +14,7 @@ vendor: "Flowgre Group"
homepage: "http://github.com/dmabry/flowgre/"
license: "Apache License 2.0"
contents:
- src: ./flowgre_linux_amd64_musl_0.4.6
- src: ./flowgre_linux_amd64_musl_0.4.7
dst: /usr/bin/flowgre
file_info:
mode: 0755
4 changes: 2 additions & 2 deletions .nfpm/nfpm-linux-amd64.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "flowgre"
arch: "amd64"
platform: "linux"
version: "v0.4.6"
version: "v0.4.7"
section: "default"
priority: "extra"
provides:
@@ -14,7 +14,7 @@ vendor: "Flowgre Group"
homepage: "http://github.com/dmabry/flowgre/"
license: "Apache License 2.0"
contents:
- src: ./flowgre_linux_amd64_0.4.6
- src: ./flowgre_linux_amd64_0.4.7
dst: /usr/bin/flowgre
file_info:
mode: 0755
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Use of this source code is governed by Apache License 2.0
# that can be found in the LICENSE file.

FROM golang:1.20-alpine3.17 AS build-stage
FROM golang:alpine AS build-stage

COPY . /opt/src
WORKDIR /opt/src
@@ -17,7 +17,7 @@ RUN git submodule -q update
RUN go build

# deploy
FROM alpine:3.17
FROM alpine:latest

# add some alpine deps
RUN apk add --no-cache tzdata
@@ -32,4 +32,4 @@ ENTRYPOINT [ "/opt/app/flowgre" ]
LABEL org.opencontainers.image.source=https://github.com/dmabry/flowgre
LABEL org.opencontainers.image.description="Flowgre container image"
LABEL org.opencontainers.image.licenses="Apache License 2.0"
LABEL org.opencontainers.image.version="0.4.6"
LABEL org.opencontainers.image.version="0.4.7"
2 changes: 1 addition & 1 deletion flowgre.go
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
)

const (
version = "0.4.6" // semantic version
version = "0.4.7" // semantic version
license = "Apache License, Version 2.0"
)