Skip to content

Commit 9850413

Browse files
committed
use fluent docker
1 parent 8cd2e4e commit 9850413

File tree

11 files changed

+80
-161
lines changed

11 files changed

+80
-161
lines changed

docker/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker/authentication_token.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

docker/docker-compose.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

docker/entrypoint.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

docker/gitlab.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env ruby
2+
3+
prometheus['enable'] = false
4+
prometheus_monitoring['enable'] = false
5+
alertmanager['enable'] = false
6+
grafana['enable'] = false
7+
gitlab_rails['initial_root_password'] = 'password'

docker/init.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env ruby
2+
u = User.first
3+
4+
g = Group.create!(name: 'txxxestgrouxxxp', path: 'txxxestgrouxxxp')
5+
p = Project.create!(namespace: g, creator: u, path: 'txxxestprojecxxxt', name: 'txxxestprojecxxxt')
6+
p.repository.create_if_not_exists
7+
c = p.repository.create_dir(u, 'newdir', message: 'Create newdir', branch_name: 'master')
8+
9+
t = PersonalAccessToken.new({ user: u, name: 'gitlab-api-client', scopes: ['api']})
10+
t.save!
11+
12+
puts t.token

docker/test_setup.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

docker/volumes/placeholder.gitkeep

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/GitLabApiClient.Test/GitLabApiClient.Test.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netcoreapp3.0</TargetFramework>
44
<IsPackable>false</IsPackable>
@@ -11,6 +11,7 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageReference Include="coverlet.collector" Version="1.1.0" />
14+
<PackageReference Include="Ductus.FluentDocker" Version="2.7.46-beta0080" />
1415
<PackageReference Include="FakeItEasy" Version="5.4.0" />
1516
<PackageReference Include="FluentAssertions" Version="5.9.0" />
1617
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />

test/GitLabApiClient.Test/Utilities/GitLabApiHelper.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ namespace GitLabApiClient.Test.Utilities
55
{
66
internal static class GitLabApiHelper
77
{
8-
private const string PrivateAuthenticationToken = "ElijahBaley";
9-
108
public static GitLabHttpFacade GetFacade()
119
{
1210
var facade = new GitLabHttpFacade(
13-
"http://localhost:9190/api/v4/", new RequestsJsonSerializer(), PrivateAuthenticationToken);
11+
GitLabContainerFixture.GitlabHost, new RequestsJsonSerializer(), GitLabContainerFixture.Token);
1412

1513
return facade;
1614
}

0 commit comments

Comments
 (0)