Skip to content
This repository has been archived by the owner on Aug 14, 2020. It is now read-only.

Commit

Permalink
gofmt
Browse files Browse the repository at this point in the history
  • Loading branch information
iaguis committed Jan 29, 2015
1 parent e2bc29b commit ee8997f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions lib/docker2aci.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func getRepoData(indexURL string, remote string) (*RepoData, error) {

func getImageIDFromTag(registry string, appName string, tag string, repoData *RepoData) (string, error) {
client := &http.Client{}
req, err := http.NewRequest("GET", "https://" + path.Join(registry, "repositories", appName, "tags", tag), nil)
req, err := http.NewRequest("GET", "https://"+path.Join(registry, "repositories", appName, "tags", tag), nil)
if err != nil {
return "", fmt.Errorf("Failed to get Image ID: %s, URL: %s", err, req.URL)
}
Expand Down Expand Up @@ -245,7 +245,7 @@ func getImageIDFromTag(registry string, appName string, tag string, repoData *Re

func getAncestry(imgID, registry string, repoData *RepoData) ([]string, error) {
client := &http.Client{}
req, err := http.NewRequest("GET", "https://" + path.Join(registry, "images", imgID, "ancestry"), nil)
req, err := http.NewRequest("GET", "https://"+path.Join(registry, "images", imgID, "ancestry"), nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -347,7 +347,7 @@ func buildACI(layerID string, repoData *RepoData, dockerURL *DockerURL, outputDi

func getRemoteImageJSON(imgID, registry string, repoData *RepoData) ([]byte, int, error) {
client := &http.Client{}
req, err := http.NewRequest("GET", "https://" + path.Join(registry, "images", imgID, "json"), nil)
req, err := http.NewRequest("GET", "https://"+path.Join(registry, "images", imgID, "json"), nil)
if err != nil {
return nil, -1, err
}
Expand Down Expand Up @@ -382,7 +382,7 @@ func getRemoteImageJSON(imgID, registry string, repoData *RepoData) ([]byte, int

func getRemoteLayer(imgID, registry string, repoData *RepoData, imgSize int64) (io.ReadCloser, error) {
client := &http.Client{}
req, err := http.NewRequest("GET", "https://" + path.Join(registry, "images", imgID, "layer"), nil)
req, err := http.NewRequest("GET", "https://"+path.Join(registry, "images", imgID, "layer"), nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -647,7 +647,7 @@ func mergeManifests(manifests []schema.ImageManifest) schema.ImageManifest {
manifest.Dependencies = nil

layerIndex := -1
for i, l := range(manifest.Labels) {
for i, l := range manifest.Labels {
if l.Name.String() == "layer" {
layerIndex = i
}
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (
)

var (
flagImport = flag.Bool("import", false, "Import ACI images to the rocket store")
flagImport = flag.Bool("import", false, "Import ACI images to the rocket store")
flagNoSquash = flag.Bool("nosquash", false, "Don't Squash layers and output every layer as ACI")
)

Expand Down

0 comments on commit ee8997f

Please sign in to comment.