Skip to content

Commit

Permalink
Merge branch 'dev' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
LinkinStars committed Sep 23, 2024
2 parents 462e1d0 + 0d6ea89 commit 66eb2d1
Show file tree
Hide file tree
Showing 20 changed files with 461 additions and 1,227 deletions.
68 changes: 68 additions & 0 deletions .github/workflows/build-image-for-latest-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: Build Latest Docker Image For Release

on:
push:
tags:
- v2.*
- v1.*
- v0.*
- "!v*-RC*"
# pull_request:
# branches: [ "main" ]

jobs:
build:
if: ${{ github.repository_owner == 'apache' }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: apache/answer
tags: |
type=raw,value=latest
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
file: ./Dockerfile
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}


2 changes: 0 additions & 2 deletions .github/workflows/build-image-for-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ name: Build Docker Image For Release

on:
push:
branches: [ "main"]
tags:
- v2.*
- v1.*
Expand All @@ -41,7 +40,6 @@ jobs:
with:
images: apache/answer
tags: |
type=raw,value=latest
type=ref,enable=true,priority=600,prefix=,suffix=,event=branch
type=semver,pattern={{version}}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.

FROM golang:1.19-alpine AS golang-builder
LABEL maintainer="aichy@sf.com"
FROM golang:1.22-alpine AS golang-builder
LABEL maintainer="linkinstar@apache.org"

ARG GOPROXY
# ENV GOPROXY ${GOPROXY:-direct}
Expand Down
8 changes: 4 additions & 4 deletions docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -11559,12 +11559,12 @@ const docTemplate = `{

// SwaggerInfo holds exported Swagger Info so clients can modify it
var SwaggerInfo = &swag.Spec{
Version: "= \"v0.0.1\"",
Version: "",
Host: "",
BasePath: "= \"/\"",
BasePath: "/",
Schemes: []string{},
Title: "\"apache answer\"",
Description: "= \"apache answer api\"",
Title: "Apache Answer",
Description: "Apache Answer API",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
LeftDelim: "{{",
Expand Down
9 changes: 4 additions & 5 deletions docs/swagger.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"swagger": "2.0",
"info": {
"description": "= \"apache answer api\"",
"title": "\"apache answer\"",
"contact": {},
"version": "= \"v0.0.1\""
"description": "Apache Answer API",
"title": "Apache Answer",
"contact": {}
},
"basePath": "= \"/\"",
"basePath": "/",
"paths": {
"/": {
"get": {
Expand Down
7 changes: 3 additions & 4 deletions docs/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

basePath: = "/"
basePath: /
definitions:
constant.NotificationChannelKey:
enum:
Expand Down Expand Up @@ -2910,9 +2910,8 @@ definitions:
type: object
info:
contact: {}
description: = "apache answer api"
title: '"apache answer"'
version: = "v0.0.1"
description: Apache Answer API
title: Apache Answer
paths:
/:
get:
Expand Down
Loading

0 comments on commit 66eb2d1

Please sign in to comment.