Skip to content

Commit

Permalink
add dind service
Browse files Browse the repository at this point in the history
  • Loading branch information
RoryQ committed Jun 21, 2023
1 parent f3cd060 commit 56aa89b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 168 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,22 @@ name: Tests with spanner emulator
jobs:
tests:
runs-on: ubuntu-latest
container: node:10.18-jessie
services:
spanner:
env:
SPANNER_INSTANCE_ID: ${{env.SPANNER_INSTANCE_ID}}
SPANNER_PROJECT_ID: ${{env.SPANNER_PROJECT_ID}}
image: roryq/spanner-emulator:1.4.0
ports:
- 9010:9010
dind:
image: docker:23.0-rc-dind-rootless
ports:
- 2375:2375
env:
SPANNER_INSTANCE_ID: inst
SPANNER_PROJECT_ID: proj
SPANNER_EMULATOR_HOST: spanner:9010
SPANNER_EMULATOR_HOST: localhost:9010
steps:
- name: Install Go
uses: actions/setup-go@v2
Expand Down
19 changes: 0 additions & 19 deletions cmd/schema.go
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
// Copyright (c) 2020 Mercari, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of
// this software and associated documentation files (the "Software"), to deal in
// the Software without restriction, including without limitation the rights to
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
// the Software, and to permit persons to whom the Software is furnished to do so,
// subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package cmd

import (
Expand Down
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/kennygrant/sanitize v1.2.4
github.com/kr/pretty v0.2.1
github.com/ory/dockertest/v3 v3.10.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
Expand Down Expand Up @@ -46,7 +45,6 @@ require (
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/text v0.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
Expand Down
Loading

0 comments on commit 56aa89b

Please sign in to comment.