Skip to content

Commit

Permalink
added devcontainers, restrcutured apis, removed api net 3, updated ne…
Browse files Browse the repository at this point in the history
…t6 to net7
  • Loading branch information
madebygps committed Nov 17, 2023
1 parent ad8593a commit 9b5b179
Show file tree
Hide file tree
Showing 245 changed files with 1,829 additions and 3,348 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
{
"name": ".NET Backend",
"name": ".NET API",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
Expand All @@ -11,11 +11,11 @@

// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "backend",
"service": "api",

// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/workspace/backend",
"workspaceFolder": "/workspace/api",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand All @@ -27,7 +27,15 @@
// "runServices": [],

// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
"shutdownAction": "none",
"shutdownAction": "none",
"customizations": {
"vscode": {
"extensions": [
"ms-azuretools.vscode-azurefunctions",
"ms-dotnettools.csharp"
]
}
},

// Uncomment the next line to run commands after the container is created.
// "postCreateCommand": "cat /etc/os-release",
Expand Down
9 changes: 5 additions & 4 deletions .devcontainer/frontend/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
{
"name": "JS Frontend",
"name": "Existing Docker Compose (Extend)",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
"dockerComposeFile": [
"../../docker-compose.yml"
"../docker-compose.yml",
"docker-compose.yml"
],

// The 'service' property is the name of the service for the container that VS Code should
Expand All @@ -15,7 +16,7 @@

// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/workspace/frontend",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand All @@ -27,7 +28,7 @@
// "runServices": [],

// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
"shutdownAction": "none",
// "shutdownAction": "none",

// Uncomment the next line to run commands after the container is created.
// "postCreateCommand": "cat /etc/os-release",
Expand Down
26 changes: 26 additions & 0 deletions .devcontainer/frontend/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: '3'
services:
# Update this to the name of the service you want to work with in your docker-compose.yml file
frontend:
# Uncomment if you want to override the service's Dockerfile to one in the .devcontainer
# folder. Note that the path of the Dockerfile and context is relative to the *primary*
# docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
# array). The sample below assumes your primary file is in the root of your project.
#
# build:
# context: .
# dockerfile: .devcontainer/Dockerfile

volumes:
# Update this to wherever you want VS Code to mount the folder of your project
- ..:/workspaces:cached

# Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
# cap_add:
# - SYS_PTRACE
# security_opt:
# - seccomp:unconfined

# Overrides default command so things don't shut down after the process ends.
command: /bin/sh -c "while sleep 1000; do :; done"

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: deploy_backend_net6
name: deploy_api

on:
workflow_dispatch:
push:
branches: [ main ]
paths:
- 'backend/api-net6/**'
- 'api/**'

env:
AZURE_FUNCTIONAPP_NAME: GetVisitorCounter # set this to your application's name
AZURE_FUNCTIONAPP_PACKAGE_PATH: 'backend' # set this to the path to your web app project, defaults to the repository root
DOTNET_VERSION: '6.0' # set this to the dotnet version to use
AZURE_FUNCTIONAPP_PACKAGE_PATH: 'api' # set this to the path to your web app project, defaults to the repository root
DOTNET_VERSION: '7.0' # set this to the dotnet version to use

jobs:
build-and-deploy:
Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/backend.main.yml

This file was deleted.

Loading

0 comments on commit 9b5b179

Please sign in to comment.