Skip to content

Commit

Permalink
Update inx-app to d7dfe94bdc1e
Browse files Browse the repository at this point in the history
  • Loading branch information
muXxer committed Feb 16, 2024
1 parent 42463b8 commit d9adc54
Show file tree
Hide file tree
Showing 12 changed files with 170 additions and 141 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
id: go

- name: Print Go version
run: go version

- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build
run: go build -v .
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build Docker image
run: docker build . --file Dockerfile --tag inx-indexer:latest
6 changes: 3 additions & 3 deletions .github/workflows/gendoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
id: go

- name: Print Go version
run: go version

- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run gendoc
working-directory: tools/gendoc
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Release
on:
release:
types: [published]
workflow_dispatch:

jobs:
docker:
Expand Down Expand Up @@ -30,6 +31,7 @@ jobs:
type=match,pattern=v(\d+.\d+),suffix=-alpha,group=1,enable=${{ contains(github.ref, '-alpha') }}
type=match,pattern=v(\d+.\d+),suffix=-beta,group=1,enable=${{ contains(github.ref, '-beta') }}
type=match,pattern=v(\d+.\d+),suffix=-rc,group=1,enable=${{ contains(github.ref, '-rc') }}
type=raw,value=${{ github.ref_name }},enable=${{ github.ref_type != 'tag' }}
- name: Login to DockerHub
uses: docker/login-action@v2
Expand All @@ -43,4 +45,6 @@ jobs:
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
push: true
build-args: |
BUILD_VERSION=${{ github.ref_name }}
tags: ${{ steps.meta.outputs.tags }}
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# https://hub.docker.com/_/golang
FROM golang:1.21-bullseye AS build
FROM golang:1.22-bullseye AS build

ARG BUILD_VERSION=v2.0.0-develop

# Ensure ca-certificates are up to date
RUN update-ca-certificates
Expand All @@ -19,17 +21,17 @@ RUN go mod download
RUN go mod verify

# Build the binary
RUN go build -o /app/inx-indexer -a
RUN go build -o /app/inx-indexer -a -ldflags="-w -s -X=github.com/iotaledger/inx-indexer/components/app.Version=${BUILD_VERSION}"

# Copy the assets
COPY ./config_defaults.json /app/config.json

############################
# Image
############################
# https://console.cloud.google.com/gcr/images/distroless/global/cc-debian11
# https://console.cloud.google.com/gcr/images/distroless/global/cc-debian12
# using distroless cc "nonroot" image, which includes everything in the base image (glibc, libssl and openssl)
FROM gcr.io/distroless/cc-debian11:nonroot
FROM gcr.io/distroless/cc-debian12:nonroot

HEALTHCHECK --interval=10s --timeout=5s --retries=30 CMD [ "/app/inx-indexer", "tools", "health"]

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://hub.docker.com/_/golang
FROM golang:1.21-bookworm AS build
FROM golang:1.22-bookworm AS build

# Ensure ca-certificates are up to date
RUN update-ca-certificates
Expand Down Expand Up @@ -28,7 +28,7 @@ COPY ./config_defaults.json /app/config.json
############################
# Image
############################
FROM golang:1.21-bookworm
FROM golang:1.22-bookworm

## Install delve
RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest
Expand Down
2 changes: 1 addition & 1 deletion components/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var (
Name = "inx-indexer"

// Version of the app.
Version = "2.0.0-alpha.22"
Version = "v2.0.0-develop"
)

func App() *app.App {
Expand Down
42 changes: 21 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
module github.com/iotaledger/inx-indexer

go 1.21
go 1.22

require (
github.com/ethereum/go-ethereum v1.13.12
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/iotaledger/hive.go/app v0.0.0-20240214175801-9ca9f93790f5
github.com/iotaledger/hive.go/crypto v0.0.0-20240214175801-9ca9f93790f5
github.com/iotaledger/hive.go/ds v0.0.0-20240214175801-9ca9f93790f5
github.com/iotaledger/hive.go/ierrors v0.0.0-20240214175801-9ca9f93790f5
github.com/iotaledger/hive.go/lo v0.0.0-20240214175801-9ca9f93790f5
github.com/iotaledger/hive.go/log v0.0.0-20240214175801-9ca9f93790f5
github.com/iotaledger/hive.go/runtime v0.0.0-20240214175801-9ca9f93790f5
github.com/iotaledger/inx-app v1.0.0-rc.3.0.20240214181534-9a393ea95057
github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240214181217-a6dd0abaab8d
github.com/iotaledger/iota.go/v4 v4.0.0-20240214180848-ff6a4bb7bc41
github.com/iotaledger/hive.go/app v0.0.0-20240216135101-261e99d9d84a
github.com/iotaledger/hive.go/crypto v0.0.0-20240216135101-261e99d9d84a
github.com/iotaledger/hive.go/ds v0.0.0-20240216135101-261e99d9d84a
github.com/iotaledger/hive.go/ierrors v0.0.0-20240216135101-261e99d9d84a
github.com/iotaledger/hive.go/lo v0.0.0-20240216135101-261e99d9d84a
github.com/iotaledger/hive.go/log v0.0.0-20240216135101-261e99d9d84a
github.com/iotaledger/hive.go/runtime v0.0.0-20240216135101-261e99d9d84a
github.com/iotaledger/inx-app v1.0.0-rc.3.0.20240216141618-d7dfe94bdc1e
github.com/iotaledger/inx/go v1.0.0-rc.2.0.20240216141023-6d5f4ef12ac5
github.com/iotaledger/iota.go/v4 v4.0.0-20240216140514-c867d6524642
github.com/labstack/echo-contrib v0.15.0
github.com/labstack/echo/v4 v4.11.4
github.com/pkg/errors v0.9.1
Expand All @@ -23,9 +23,9 @@ require (
github.com/stretchr/testify v1.8.4
go.uber.org/dig v1.17.1
golang.org/x/text v0.14.0
gorm.io/driver/postgres v1.5.4
gorm.io/driver/sqlite v1.5.4
gorm.io/gorm v1.25.5
gorm.io/driver/postgres v1.5.6
gorm.io/driver/sqlite v1.5.5
gorm.io/gorm v1.25.7
)

require (
Expand All @@ -50,13 +50,13 @@ require (
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/holiman/uint256 v1.2.4 // indirect
github.com/iancoleman/orderedmap v0.3.0 // indirect
github.com/iotaledger/hive.go/constraints v0.0.0-20240214175801-9ca9f93790f5 // indirect
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240214175801-9ca9f93790f5 // indirect
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240214175801-9ca9f93790f5 // indirect
github.com/iotaledger/hive.go/stringify v0.0.0-20240214175801-9ca9f93790f5 // indirect
github.com/iotaledger/hive.go/constraints v0.0.0-20240216135101-261e99d9d84a // indirect
github.com/iotaledger/hive.go/core v1.0.0-rc.3.0.20240216135101-261e99d9d84a // indirect
github.com/iotaledger/hive.go/serializer/v2 v2.0.0-rc.1.0.20240216135101-261e99d9d84a // indirect
github.com/iotaledger/hive.go/stringify v0.0.0-20240216135101-261e99d9d84a // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/pgx/v5 v5.5.2 // indirect
github.com/jackc/pgx/v5 v5.5.3 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
Expand All @@ -65,7 +65,7 @@ require (
github.com/labstack/gommon v0.4.2 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-sqlite3 v1.14.19 // indirect
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -75,7 +75,7 @@ require (
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/common v0.47.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/spf13/cast v1.6.0 // indirect
Expand Down
Loading

0 comments on commit d9adc54

Please sign in to comment.