Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
Restructure pass 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Chuxel committed Mar 21, 2019
1 parent 1c9123f commit 0e4b4f7
Show file tree
Hide file tree
Showing 98 changed files with 781 additions and 617 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ bin
obj
*.DS_Store
*.pyc
.idea
Thumbs.db
.build
node_modules
node_modules
.vscode/ipch
*.out
*.log
17 changes: 13 additions & 4 deletions definitions/azure-cli/dev-container.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
FROM debian

RUN apt-get update \
&& apt-get install -y apt-transport-https curl gnupg2 lsb-release \
# Install git
RUN apt-get update && apt-get -y install git

# Install the Azure CLI
RUN apt-get install -y apt-transport-https curl gnupg2 lsb-release \
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
&& curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
&& apt-get update \
&& apt-get install -y azure-cli \
&& rm -rf /var/lib/apt/lists/*
&& apt-get install -y azure-cli

# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/*

22 changes: 16 additions & 6 deletions definitions/azure-functions-node/dev-container.dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
FROM microsoft/dotnet:2.1-sdk-stretch

# Install required tools
# Install git
RUN apt-get update && apt-get -y install git

RUN apt-get update \
&& apt-get install -y git apt-transport-https curl \
# Install Node.js
RUN apt-get install -y curl \
&& curl -sSL https://deb.nodesource.com/setup_8.x | bash - \
&& apt-get update \
&& apt-get install -y nodejs

# Install Azure Functions
RUN apt-get install -y apt-transport-https \
&& curl -sSO https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
&& apt-get update \
&& apt-get install -y nodejs \
&& apt-get download azure-functions-core-tools \
&& dpkg -i --force-depends azure-functions-core-tools*.deb \
&& rm azure-functions-core-tools*.deb \
&& rm -rf /var/lib/apt/lists/*
&& rm azure-functions-core-tools*.deb

# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/*
Binary file not shown.
Binary file not shown.
9 changes: 5 additions & 4 deletions definitions/cpp/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"version": "0.2.0",
"configurations": [
{
"name": "(gdb) Launch",
"name": "Launch Main",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/test-project/a.out",
"program": "${workspaceFolder}/test-project/main.out",
"args": [],
"stopAtEntry": false,
"stopAtEntry": true,
"cwd": "${workspaceFolder}/test-project",
"environment": [],
"externalConsole": false,
Expand All @@ -21,7 +21,8 @@
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
],
"preLaunchTask": "Build Main"
}
]
}
16 changes: 16 additions & 0 deletions definitions/cpp/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "Build Main",
"type": "shell",
"command": " cd test-project && g++ -g main.cpp -o main.out",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions definitions/cpp/.vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ test-project
.vscode/launch.test.json
.vscode/settings.json
.vscode/tasks.json
.vscode/ipch
6 changes: 3 additions & 3 deletions definitions/cpp/dev-container.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ubuntu:latest

RUN apt-get update

RUN apt-get -y install git
# Install git
RUN apt-get update && apt-get -y install git

# Install C++ tools
RUN apt-get -y install build-essential cmake cppcheck valgrind

# Clean up
Expand Down
10 changes: 10 additions & 0 deletions definitions/dart-web/dev-container.dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
FROM google/dart
ENV PATH="$PATH":"/root/.pub-cache/bin"
RUN pub global activate webdev

# Install git
RUN apt-get update && apt-get -y install git

# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/*

2 changes: 1 addition & 1 deletion definitions/docker-in-docker/dev-container.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Note: You can use any Debian/Ubuntu based image you want.
FROM ubuntu:latest

# Install required tools
# Install git
RUN apt-get update \
&& apt-get install -y git

Expand Down
15 changes: 15 additions & 0 deletions definitions/dotnetcore-2.2-fsharp/dev-container.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM microsoft/dotnet:2.2-sdk

# Install git
RUN apt-get update && apt-get -y install git


# Install fsharp
RUN apt-get update && apt-get -y fsharp

# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/*

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": ".NET Core",
"dockerFile": "dev-container.dockerfile",
"extensions": [
"ms-vscode.csharp"
]
{
"name": ".NET Core",
"dockerFile": "dev-container.dockerfile",
"extensions": [
"ms-vscode.csharp"
]
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"program": "dotnet",
"args": ["run"],
"cwd": "${workspaceFolder}/test-project",
}
]
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"program": "dotnet",
"args": ["run"],
"cwd": "${workspaceFolder}/test-project",
}
]
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"razor.disabled": true
}
{
"razor.disabled": true
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM microsoft/dotnet:2.2-sdk

RUN apt-get update

RUN apt-get -y install git libunwind8
# Install git
RUN apt-get update && apt-get -y install git

# Clean up
RUN apt-get autoremove -y \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
using System;
using System.Linq;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Builder;
using Newtonsoft.Json;
using Microsoft.AspNetCore.Http;
using System.IO;

namespace aspnetapp
{
public class Program
{
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseUrls("http://0.0.0.0:8090")
.Configure(app => app.Run(async context => {
await context.Response.WriteAsync("Hello world from ASP.NET Core");
}))
.Build();

host.Run();
}

}
using System;
using System.Linq;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Builder;
using Newtonsoft.Json;
using Microsoft.AspNetCore.Http;
using System.IO;

namespace aspnetapp
{
public class Program
{
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseUrls("http://0.0.0.0:8090")
.Configure(app => app.Run(async context => {
await context.Response.WriteAsync("Hello world from ASP.NET Core");
}))
.Build();

host.Run();
}

}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<UserSecretsId>31051026529000467138</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<UserSecretsId>31051026529000467138</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

</Project>
5 changes: 0 additions & 5 deletions definitions/fsharp/dev-container.dockerfile

This file was deleted.

10 changes: 8 additions & 2 deletions definitions/go/dev-container.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,11 @@ RUN go get -u -v \
github.com/derekparker/delve/cmd/dlv

# Install git
RUN apt-get update && apt-get -y install git \
&& rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get -y install git

# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/*

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Java",
"dockerFile": "dev-container.dockerfile",
"extensions": [
"vscjava.vscode-java-pack"
]
}
{
"name": "Java",
"dockerFile": "dev-container.dockerfile",
"extensions": [
"vscjava.vscode-java-pack"
]
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"configurations": [
{
"type": "java",
"name": "Launch App",
"request": "launch",
"cwd": "${workspaceFolder}/test-project",
"console": "internalConsole",
"stopOnEntry": false,
"mainClass": "com.mycompany.app.App",
"args": "",
"projectName": "my-app"
}
]
{
"configurations": [
{
"type": "java",
"name": "Launch App",
"request": "launch",
"cwd": "${workspaceFolder}/test-project",
"console": "internalConsole",
"stopOnEntry": false,
"mainClass": "com.mycompany.app.App",
"args": "",
"projectName": "my-app"
}
]
}
File renamed without changes.
11 changes: 11 additions & 0 deletions definitions/java-8-maven/dev-container.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM maven:3.6-jdk-8-slim

# Install git
RUN apt-get update && apt-get -y install git

# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/*

Loading

0 comments on commit 0e4b4f7

Please sign in to comment.