Skip to content

Commit

Permalink
Set proper package name (#77)
Browse files Browse the repository at this point in the history
Side changes:
- Fix incorrect case in ldflag GitSHA parameter
  • Loading branch information
kayrus authored Jun 27, 2023
1 parent 32ce39b commit f2a1b8d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
FROM --platform=$BUILDPLATFORM golang:1.19-alpine AS build

ARG REPOSITORY=Lirt
ARG PLUGIN=velero-plugin-swift
ARG PLUGIN=velero-plugin-for-openstack
ARG PKG=github.com/Lirt/velero-plugin-for-openstack
ARG VERSION=0.0.0
ARG GIT_SHA=nil
Expand All @@ -25,7 +25,7 @@ ENV GOPROXY=https://proxy.golang.org

WORKDIR /go/src/github.com/${REPOSITORY}/${PLUGIN}
COPY . .
RUN export LDFLAGS="-X ${PKG}/src/utils.Version=${VERSION} -X ${PKG}/src/utils.gitSHA=${GIT_SHA}" \
RUN export LDFLAGS="-X ${PKG}/src/utils.Version=${VERSION} -X ${PKG}/src/utils.GitSHA=${GIT_SHA}" \
export GOARM=$( echo "${GOARM}" | cut -c2-) && \
CGO_ENABLED=0 \
go build \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Lirt/velero-plugin-swift
module github.com/Lirt/velero-plugin-for-openstack

go 1.19

Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/Lirt/velero-plugin-swift/src/cinder"
"github.com/Lirt/velero-plugin-swift/src/swift"
"github.com/Lirt/velero-plugin-for-openstack/src/cinder"
"github.com/Lirt/velero-plugin-for-openstack/src/swift"
"github.com/sirupsen/logrus"
veleroplugin "github.com/vmware-tanzu/velero/pkg/plugin/framework"
)
Expand Down
2 changes: 1 addition & 1 deletion src/cinder/block_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"strconv"

"github.com/Lirt/velero-plugin-swift/src/utils"
"github.com/Lirt/velero-plugin-for-openstack/src/utils"
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/snapshots"
Expand Down
2 changes: 1 addition & 1 deletion src/swift/object_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

"github.com/Lirt/velero-plugin-swift/src/utils"
"github.com/Lirt/velero-plugin-for-openstack/src/utils"
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack"
"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects"
Expand Down

0 comments on commit f2a1b8d

Please sign in to comment.