Skip to content

Commit 44ba55b

Browse files
authored
Merge pull request #219 from AndrewCS149/testWorkflow
testWorkflow
2 parents 380c1fe + 3234045 commit 44ba55b

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
55
.env
66

7+
#nginx
8+
*nginx*
9+
/https
10+
/proxy
11+
712
# rust
813
/target
914
/client/target

client/src/api.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use gloo::console::log;
22
use gloo_net::http::{Headers, Method, RequestBuilder, Response};
33
use wasm_bindgen::JsValue;
44

5-
// const URL: &str = "api/";
6-
const URL: &str = "https://localhost:32779/api/";
5+
// const URL: &str = "http://localhost:32778/api/";
6+
const URL: &str = "https://thedevblog.net/api/";
77

88
#[derive(Clone, PartialEq)]
99
pub enum Api {

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ services:
3232
volumes:
3333
- ${SERVER_PUBLISH_VOLUME}
3434
- ${SERVER_HTTPS_VOLUME}
35+
- ${SERVER_APPSETTINGS_VOLUME}
3536
ports:
3637
- ${SERVER_PORTS}

server/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM mcr.microsoft.com/dotnet/aspnet:8.0
22
EXPOSE 8080
3+
EXPOSE 80
34
EXPOSE 8081
45
WORKDIR /app/publish
56
ENTRYPOINT ["dotnet", "devblog.dll"]

server/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static void Main(string[] args)
2323
// --------------------- CORS POLICY ------------------------------
2424
builder.Services.AddCors(options =>
2525
{
26-
options.AddPolicy("AllowSpecificOrigin", b => b.WithOrigins("http://127.0.0.1:8080").AllowAnyHeader().AllowAnyMethod());
26+
options.AddPolicy("AllowSpecificOrigin", b => b.WithOrigins("http://localhost").AllowAnyHeader().AllowAnyMethod());
2727
});
2828

2929
// Add services to the container.
@@ -102,7 +102,7 @@ public static void Main(string[] args)
102102
builder.Services.AddHttpsRedirection(options =>
103103
{
104104
options.RedirectStatusCode = (int)HttpStatusCode.TemporaryRedirect;
105-
options.HttpsPort = 5001;
105+
options.HttpsPort = 32778;
106106
});
107107

108108
var app = builder.Build();

0 commit comments

Comments
 (0)